commit dleyna-core for openSUSE:Factory

Hello community, here is the log from the commit of package dleyna-core for openSUSE:Factory checked in at 2015-05-06 07:48:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dleyna-core (Old) and /work/SRC/openSUSE:Factory/.dleyna-core.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "dleyna-core" Changes: -------- --- /work/SRC/openSUSE:Factory/dleyna-core/dleyna-core.changes 2014-08-27 07:47:07.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.dleyna-core.new/dleyna-core.changes 2015-05-06 07:49:01.000000000 +0200 @@ -1,0 +2,13 @@ +Sat May 2 08:43:29 UTC 2015 - zaitor@opensuse.org + +- Update to version 0.5.0: + + [m4] Don't use bash arrays in m4 macros. + + [Autoconf] Add --no-undefined to compiler option. + + [settings]: + - Add "push-host-port" setting. + - Add "port" setting. + + [Warnings] Fix compile warnings on ARM. +- Rename subpackage libdleyna-core-1_0-4 following upstreams soname + bump. + +------------------------------------------------------------------- Old: ---- dleyna-core-0.4.0.tar.gz New: ---- dleyna-core-0.5.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dleyna-core.spec ++++++ --- /var/tmp/diff_new_pack.GDWKS0/_old 2015-05-06 07:49:02.000000000 +0200 +++ /var/tmp/diff_new_pack.GDWKS0/_new 2015-05-06 07:49:02.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package dleyna-core # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: dleyna-core -Version: 0.4.0 +Version: 0.5.0 Release: 0 Summary: Utility functions used by higher level dLeyna libraries License: LGPL-2.1 @@ -36,11 +36,11 @@ In brief, it provides APIs for logging, error, settings and task management and an IPC abstraction API. -%package -n libdleyna-core-1_0-3 +%package -n libdleyna-core-1_0-4 Summary: Utility functions used by higher level dLeyna libraries Group: System/Libraries -%description -n libdleyna-core-1_0-3 +%description -n libdleyna-core-1_0-4 dleyna-core is a library of utility functions that are used by the higher level dLeyna libraries that communicate with DLNA devices, e.g., dleyna-server. @@ -49,7 +49,7 @@ %package devel Summary: Utility functions used by higher level dLeyna libraries -- Development files Group: Development/Languages/C and C++ -Requires: libdleyna-core-1_0-3 = %{version} +Requires: libdleyna-core-1_0-4 = %{version} %description devel dleyna-core is a library of utility functions that are used by the higher level dLeyna libraries that @@ -68,11 +68,11 @@ %make_install find %{buildroot}%{_libdir} -type f -name '*.la' -delete -print -%post -n libdleyna-core-1_0-3 -p /sbin/ldconfig +%post -n libdleyna-core-1_0-4 -p /sbin/ldconfig -%postun -n libdleyna-core-1_0-3 -p /sbin/ldconfig +%postun -n libdleyna-core-1_0-4 -p /sbin/ldconfig -%files -n libdleyna-core-1_0-3 +%files -n libdleyna-core-1_0-4 %defattr(-,root,root) %doc ChangeLog README COPYING %{_libdir}/libdleyna-core-1.0.so.* ++++++ dleyna-core-0.4.0.tar.gz -> dleyna-core-0.5.0.tar.gz ++++++ ++++ 4779 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dleyna-core-0.4.0/ChangeLog new/dleyna-core-0.5.0/ChangeLog --- old/dleyna-core-0.4.0/ChangeLog 2013-10-03 14:13:40.000000000 +0200 +++ new/dleyna-core-0.5.0/ChangeLog 2014-12-06 12:51:56.000000000 +0100 @@ -1,3 +1,13 @@ +version 0.5.0 + - [m4] Don't use bash arrays in m4 macros + https://github.com/01org/dleyna-core/issues/41 + - [Autoconf] Add --no-undefined to compiler option + https://github.com/01org/dleyna-core/issues/33 + - [settings] Add "push-host-port" setting + - [settings] Add "port" setting + - [Warnings] Fix compile warnings on ARM + Partial fix for https://github.com/01org/dleyna-renderer/issues/137 + version 0.4.0 - Logs: print correct service name & version - Fix a bug in the task queue cancellation diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dleyna-core-0.4.0/INSTALL new/dleyna-core-0.5.0/INSTALL --- old/dleyna-core-0.4.0/INSTALL 2013-10-03 14:22:11.000000000 +0200 +++ new/dleyna-core-0.5.0/INSTALL 2014-12-06 12:49:29.000000000 +0100 @@ -1,7 +1,7 @@ Installation Instructions ************************* -Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation, +Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, @@ -12,8 +12,8 @@ Basic Installation ================== - Briefly, the shell commands `./configure; make; make install' should -configure, build, and install this package. The following + Briefly, the shell command `./configure && make && make install' +should configure, build, and install this package. The following more-detailed instructions are generic; see the `README' file for instructions specific to this package. Some packages provide this `INSTALL' file but do not implement all of the features documented @@ -309,9 +309,10 @@ overridden in the site shell script). Unfortunately, this technique does not work for `CONFIG_SHELL' due to -an Autoconf bug. Until the bug is fixed you can use this workaround: +an Autoconf limitation. Until the limitation is lifted, you can use +this workaround: - CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash + CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash `configure' Invocation ====================== @@ -367,4 +368,3 @@ `configure' also accepts some other, not widely useful, options. Run `configure --help' for more details. - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dleyna-core-0.4.0/Makefile.am new/dleyna-core-0.5.0/Makefile.am --- old/dleyna-core-0.4.0/Makefile.am 2013-10-03 14:20:49.000000000 +0200 +++ new/dleyna-core-0.5.0/Makefile.am 2014-12-06 12:51:56.000000000 +0100 @@ -2,7 +2,7 @@ connectordir = $(libdir)/dleyna-1.0/connectors sysconfigdir = $(sysconfdir) -DLEYNA_CORE_VERSION = 3:0:0 +DLEYNA_CORE_VERSION = 4:0:0 AM_CFLAGS = $(GLIB_CFLAGS) \ $(GIO_CFLAGS) \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dleyna-core-0.4.0/build-aux/compile new/dleyna-core-0.5.0/build-aux/compile --- old/dleyna-core-0.4.0/build-aux/compile 2013-10-03 14:22:11.000000000 +0200 +++ new/dleyna-core-0.5.0/build-aux/compile 2014-12-06 12:49:29.000000000 +0100 @@ -1,10 +1,9 @@ #! /bin/sh # Wrapper for compilers which do not understand '-c -o'. -scriptversion=2012-03-05.13; # UTC +scriptversion=2012-10-14.11; # UTC -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009, 2010, 2012 Free -# Software Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # Written by Tom Tromey . # # This program is free software; you can redistribute it and/or modify @@ -113,6 +112,11 @@ lib=$dir/$lib.lib break fi + if test -f "$dir/lib$lib.a"; then + found=yes + lib=$dir/lib$lib.a + break + fi done IFS=$save_IFS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dleyna-core-0.4.0/build-aux/missing new/dleyna-core-0.5.0/build-aux/missing --- old/dleyna-core-0.4.0/build-aux/missing 2013-10-03 14:22:11.000000000 +0200 +++ new/dleyna-core-0.5.0/build-aux/missing 2014-12-06 12:49:29.000000000 +0100 @@ -1,11 +1,10 @@ #! /bin/sh -# Common stub for a few missing GNU programs while installing. +# Common wrapper for a few potentially missing GNU programs. -scriptversion=2012-01-06.13; # UTC +scriptversion=2013-10-28.13; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, -# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. -# Originally by Fran,cois Pinard , 1996. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Originally written by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -26,68 +25,40 @@ # the same distribution terms that you use for the rest of that program. if test $# -eq 0; then - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "Try '$0 --help' for more information" exit 1 fi -run=: -sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' -sed_minuso='s/.* -o \([^ ]*\).*/\1/p' - -# In the cases where this matters, `missing' is being run in the -# srcdir already. -if test -f configure.ac; then - configure_ac=configure.ac -else - configure_ac=configure.in -fi +case $1 in -msg="missing on your system" + --is-lightweight) + # Used by our autoconf macros to check whether the available missing + # script is modern enough. + exit 0 + ;; -case $1 in ---run) - # Try to run requested program, and just exit if it succeeds. - run= - shift - "$@" && exit 0 - # Exit code 63 means version mismatch. This often happens - # when the user try to use an ancient version of a tool on - # a file that requires a minimum version. In this case we - # we should proceed has if the program had been absent, or - # if --run hadn't been passed. - if test $? = 63; then - run=: - msg="probably too old" - fi - ;; + --run) + # Back-compat with the calling convention used by older automake. + shift + ;; -h|--h|--he|--hel|--help) echo "\ $0 [OPTION]... PROGRAM [ARGUMENT]... -Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an -error status if there is no known handling for PROGRAM. +Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due +to PROGRAM being missing or too old. Options: -h, --help display this help and exit -v, --version output version information and exit - --run try to run the given command, and emulate it if it fails Supported PROGRAM values: - aclocal touch file \`aclocal.m4' - autoconf touch file \`configure' - autoheader touch file \`config.h.in' - autom4te touch the output file, or create a stub one - automake touch all \`Makefile.in' files - bison create \`y.tab.[ch]', if possible, from existing .[ch] - flex create \`lex.yy.c', if possible, from existing .c - help2man touch the output file - lex create \`lex.yy.c', if possible, from existing .c - makeinfo touch the output file - yacc create \`y.tab.[ch]', if possible, from existing .[ch] + aclocal autoconf autoheader autom4te automake makeinfo + bison yacc flex lex help2man -Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and -\`g' are ignored when checking the name. +Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and +'g' are ignored when checking the name. Send bug reports to ." exit $? @@ -99,228 +70,141 @@ ;; -*) - echo 1>&2 "$0: Unknown \`$1' option" - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "$0: unknown '$1' option" + echo 1>&2 "Try '$0 --help' for more information" exit 1 ;; esac -# normalize program name to check for. -program=`echo "$1" | sed ' - s/^gnu-//; t - s/^gnu//; t - s/^g//; t'` - -# Now exit if we have it, but it failed. Also exit now if we -# don't have it and --version was passed (most likely to detect -# the program). This is about non-GNU programs, so use $1 not -# $program. -case $1 in - lex*|yacc*) - # Not GNU programs, they don't have --version. - ;; +# Run the given program, remember its exit status. +"$@"; st=$? - *) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - # Could not run --version or --help. This is probably someone - # running `$TOOL --version' or `$TOOL --help' to check whether - # $TOOL exists and not knowing $TOOL uses missing. - exit 1 - fi - ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case $program in - aclocal*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acinclude.m4' or \`${configure_ac}'. You might want - to install the \`Automake' and \`Perl' packages. Grab them from - any GNU archive site." - touch aclocal.m4 - ;; - - autoconf*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`${configure_ac}'. You might want to install the - \`Autoconf' and \`GNU m4' packages. Grab them from any GNU - archive site." - touch configure - ;; - - autoheader*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acconfig.h' or \`${configure_ac}'. You might want - to install the \`Autoconf' and \`GNU m4' packages. Grab them - from any GNU archive site." - files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}` - test -z "$files" && files="config.h" - touch_files= - for f in $files; do - case $f in - *:*) touch_files="$touch_files "`echo "$f" | - sed -e 's/^[^:]*://' -e 's/:.*//'`;; - *) touch_files="$touch_files $f.in";; - esac - done - touch $touch_files - ;; +# If it succeeded, we are done. +test $st -eq 0 && exit 0 - automake*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. - You might want to install the \`Automake' and \`Perl' packages. - Grab them from any GNU archive site." - find . -type f -name Makefile.am -print | - sed 's/\.am$/.in/' | - while read f; do touch "$f"; done - ;; - - autom4te*) - echo 1>&2 "\ -WARNING: \`$1' is needed, but is $msg. - You might have modified some files without having the - proper tools for further handling them. - You can get \`$1' as part of \`Autoconf' from any GNU - archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo "#! /bin/sh" - echo "# Created by GNU Automake missing as a replacement of" - echo "# $ $@" - echo "exit 0" - chmod +x $file - exit 1 - fi - ;; - - bison*|yacc*) - echo 1>&2 "\ -WARNING: \`$1' $msg. You should only need it if - you modified a \`.y' file. You may need the \`Bison' package - in order for those modifications to take effect. You can get - \`Bison' from any GNU archive site." - rm -f y.tab.c y.tab.h - if test $# -ne 1; then - eval LASTARG=\${$#} - case $LASTARG in - *.y) - SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.c - fi - SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.h - fi - ;; - esac - fi - if test ! -f y.tab.h; then - echo >y.tab.h - fi - if test ! -f y.tab.c; then - echo 'main() { return 0; }' >y.tab.c - fi - ;; - - lex*|flex*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.l' file. You may need the \`Flex' package - in order for those modifications to take effect. You can get - \`Flex' from any GNU archive site." - rm -f lex.yy.c - if test $# -ne 1; then - eval LASTARG=\${$#} - case $LASTARG in - *.l) - SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" lex.yy.c - fi - ;; - esac - fi - if test ! -f lex.yy.c; then - echo 'main() { return 0; }' >lex.yy.c - fi - ;; - - help2man*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a dependency of a manual page. You may need the - \`Help2man' package in order for those modifications to take - effect. You can get \`Help2man' from any GNU archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo ".ab help2man is required to generate this page" - exit $? - fi - ;; - - makeinfo*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.texi' or \`.texinfo' file, or any other file - indirectly affecting the aspect of the manual. The spurious - call might also be the consequence of using a buggy \`make' (AIX, - DU, IRIX). You might want to install the \`Texinfo' package or - the \`GNU make' package. Grab either from any GNU archive site." - # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -z "$file"; then - # ... or it is the one specified with @setfilename ... - infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` - file=`sed -n ' - /^@setfilename/{ - s/.* \([^ ]*\) *$/\1/ - p - q - }' $infile` - # ... or it is derived from the source name (dir/f.texi becomes f.info) - test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info - fi - # If the file does not exist, the user really needs makeinfo; - # let's fail without touching anything. - test -f $file || exit 1 - touch $file - ;; - - *) - echo 1>&2 "\ -WARNING: \`$1' is needed, and is $msg. - You might have modified some files without having the - proper tools for further handling them. Check the \`README' file, - it often tells you about the needed prerequisites for installing - this package. You may also peek at any GNU archive site, in case - some other package would contain this missing \`$1' program." - exit 1 - ;; -esac +# Also exit now if we it failed (or wasn't found), and '--version' was +# passed; such an option is passed most likely to detect whether the +# program is present and works. +case $2 in --version|--help) exit $st;; esac + +# Exit code 63 means version mismatch. This often happens when the user +# tries to use an ancient version of a tool on a file that requires a +# minimum version. +if test $st -eq 63; then + msg="probably too old" +elif test $st -eq 127; then + # Program was missing. + msg="missing on your system" +else + # Program was found and executed, but failed. Give up. + exit $st +fi -exit 0 +perl_URL=http://www.perl.org/ +flex_URL=http://flex.sourceforge.net/ +gnu_software_URL=http://www.gnu.org/software + +program_details () +{ + case $1 in + aclocal|automake) + echo "The '$1' program is part of the GNU Automake package:" + echo "<$gnu_software_URL/automake>" + echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/autoconf>" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + autoconf|autom4te|autoheader) + echo "The '$1' program is part of the GNU Autoconf package:" + echo "<$gnu_software_URL/autoconf/>" + echo "It also requires GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + esac +} + +give_advice () +{ + # Normalize program name to check for. + normalized_program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + + printf '%s\n' "'$1' is $msg." + + configure_deps="'configure.ac' or m4 files included by 'configure.ac'" + case $normalized_program in + autoconf*) + echo "You should only need it if you modified 'configure.ac'," + echo "or m4 files included by it." + program_details 'autoconf' + ;; + autoheader*) + echo "You should only need it if you modified 'acconfig.h' or" + echo "$configure_deps." + program_details 'autoheader' + ;; + automake*) + echo "You should only need it if you modified 'Makefile.am' or" + echo "$configure_deps." + program_details 'automake' + ;; + aclocal*) + echo "You should only need it if you modified 'acinclude.m4' or" + echo "$configure_deps." + program_details 'aclocal' + ;; + autom4te*) + echo "You might have modified some maintainer files that require" + echo "the 'autom4te' program to be rebuilt." + program_details 'autom4te' + ;; + bison*|yacc*) + echo "You should only need it if you modified a '.y' file." + echo "You may want to install the GNU Bison package:" + echo "<$gnu_software_URL/bison/>" + ;; + lex*|flex*) + echo "You should only need it if you modified a '.l' file." + echo "You may want to install the Fast Lexical Analyzer package:" + echo "<$flex_URL>" + ;; + help2man*) + echo "You should only need it if you modified a dependency" \ + "of a man page." + echo "You may want to install the GNU Help2man package:" + echo "<$gnu_software_URL/help2man/>" + ;; + makeinfo*) + echo "You should only need it if you modified a '.texi' file, or" + echo "any other file indirectly affecting the aspect of the manual." + echo "You might want to install the Texinfo package:" + echo "<$gnu_software_URL/texinfo/>" + echo "The spurious makeinfo call might also be the consequence of" + echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might" + echo "want to install GNU make:" + echo "<$gnu_software_URL/make/>" + ;; + *) + echo "You might have modified some files without having the proper" + echo "tools for further handling them. Check the 'README' file, it" + echo "often tells you about the needed prerequisites for installing" + echo "this package. You may also peek at any GNU archive site, in" + echo "case some other package contains this missing '$1' program." + ;; + esac +} + +give_advice "$1" | sed -e '1s/^/WARNING: /' \ + -e '2,$s/^/ /' >&2 + +# Propagate the correct exit status (expected to be 127 for a program +# not found, 63 for a program that failed due to version mismatch). +exit $st # Local variables: # eval: (add-hook 'write-file-hooks 'time-stamp) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dleyna-core-0.4.0/config.h.in new/dleyna-core-0.5.0/config.h.in --- old/dleyna-core-0.4.0/config.h.in 2013-10-03 14:22:11.000000000 +0200 +++ new/dleyna-core-0.5.0/config.h.in 2014-12-06 12:49:28.000000000 +0100 @@ -108,9 +108,6 @@ */ #undef LT_OBJDIR -/* Define to 1 if your C compiler doesn't accept -c and -o together. */ -#undef NO_MINUS_C_MINUS_O - /* Name of package */ #undef PACKAGE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dleyna-core-0.4.0/configure.ac new/dleyna-core-0.5.0/configure.ac --- old/dleyna-core-0.4.0/configure.ac 2013-10-03 14:14:04.000000000 +0200 +++ new/dleyna-core-0.5.0/configure.ac 2014-12-06 12:51:56.000000000 +0100 @@ -1,7 +1,7 @@ AC_PREREQ([2.66]) AC_INIT([dleyna-core], - [0.4.0], + [0.5.0], [https://github.com/01org/dleyna-core/issues/new], , [https://01.org/dleyna/]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dleyna-core-0.4.0/libdleyna/core/service-task.c new/dleyna-core-0.5.0/libdleyna/core/service-task.c --- old/dleyna-core-0.4.0/libdleyna/core/service-task.c 2013-08-29 10:51:40.000000000 +0200 +++ new/dleyna-core-0.5.0/libdleyna/core/service-task.c 2014-12-06 12:51:56.000000000 +0100 @@ -125,7 +125,7 @@ g_free(task); } -gpointer *dleyna_service_task_get_user_data(dleyna_service_task_t *task) +gpointer dleyna_service_task_get_user_data(dleyna_service_task_t *task) { return task->user_data; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dleyna-core-0.4.0/libdleyna/core/service-task.h new/dleyna-core-0.5.0/libdleyna/core/service-task.h --- old/dleyna-core-0.4.0/libdleyna/core/service-task.h 2013-05-31 14:28:02.000000000 +0200 +++ new/dleyna-core-0.5.0/libdleyna/core/service-task.h 2014-12-06 12:51:56.000000000 +0100 @@ -58,6 +58,6 @@ void dleyna_service_task_delete_cb(dleyna_task_atom_t *atom, gpointer user_data); -gpointer *dleyna_service_task_get_user_data(dleyna_service_task_t *task); +gpointer dleyna_service_task_get_user_data(dleyna_service_task_t *task); #endif /* DLEYNA_SERVICE_TASK_H__ */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dleyna-core-0.4.0/libdleyna/core/settings.c new/dleyna-core-0.5.0/libdleyna/core/settings.c --- old/dleyna-core-0.4.0/libdleyna/core/settings.c 2013-10-03 13:58:05.000000000 +0200 +++ new/dleyna-core-0.5.0/libdleyna/core/settings.c 2014-12-06 12:51:56.000000000 +0100 @@ -35,6 +35,8 @@ /* Global section */ gboolean never_quit; gchar *connector_name; + guint port; + guint push_host_port; /* Log section */ dleyna_log_type_t log_type; @@ -48,6 +50,8 @@ #define DLEYNA_SETTINGS_GROUP_GENERAL "general" #define DLEYNA_SETTINGS_KEY_NEVER_QUIT "never-quit" #define DLEYNA_SETTINGS_KEY_CONNECTOR_NAME "connector-name" +#define DLEYNA_SETTINGS_KEY_PORT "port" +#define DLEYNA_SETTINGS_KEY_PUSH_HOST_PORT "push-host-port" #define DLEYNA_SETTINGS_GROUP_LOG "log" #define DLEYNA_SETTINGS_KEY_LOG_TYPE "log-type" @@ -76,6 +80,10 @@ DLEYNA_LOG_DEBUG_NL(); \ DLEYNA_LOG_INFO("Connector Name: %s", (settings)->connector_name);\ DLEYNA_LOG_DEBUG_NL(); \ + DLEYNA_LOG_INFO("Port: %u", (settings)->port);\ + DLEYNA_LOG_DEBUG_NL(); \ + DLEYNA_LOG_INFO("Push host port: %u", (settings)->push_host_port);\ + DLEYNA_LOG_DEBUG_NL(); \ \ DLEYNA_LOG_INFO("[Logging settings]"); \ DLEYNA_LOG_INFO("Log Type : %d", (settings)->log_type); \ @@ -245,6 +253,7 @@ gboolean b_val; gint int_val; gchar *s_val; + guint64 u_val; gint *int_star; gsize length; gchar **list; @@ -274,6 +283,30 @@ error = NULL; } + u_val = g_key_file_get_uint64(keyfile, + DLEYNA_SETTINGS_GROUP_GENERAL, + DLEYNA_SETTINGS_KEY_PORT, + &error); + + if (error == NULL) { + settings->port = (guint)u_val; + } else { + g_error_free(error); + error = NULL; + } + + u_val = g_key_file_get_uint64(keyfile, + DLEYNA_SETTINGS_GROUP_GENERAL, + DLEYNA_SETTINGS_KEY_PUSH_HOST_PORT, + &error); + + if (error == NULL) { + settings->push_host_port = (guint)u_val; + } else { + g_error_free(error); + error = NULL; + } + int_val = g_key_file_get_integer(keyfile, DLEYNA_SETTINGS_GROUP_LOG, DLEYNA_SETTINGS_KEY_LOG_TYPE, @@ -334,6 +367,8 @@ settings->never_quit = DLEYNA_SETTINGS_DEFAULT_NEVER_QUIT; settings->connector_name = g_strdup( DLEYNA_SETTINGS_DEFAULT_CONNECTOR_NAME); + settings->port = 0; + settings->push_host_port = 0; settings->log_type = DLEYNA_SETTINGS_DEFAULT_LOG_TYPE; settings->log_level = DLEYNA_SETTINGS_DEFAULT_LOG_LEVEL; @@ -426,6 +461,16 @@ return settings->connector_name; } +guint dleyna_settings_port(dleyna_settings_t *settings) +{ + return settings->port; +} + +guint dleyna_settings_push_host_port(dleyna_settings_t *settings) +{ + return settings->push_host_port; +} + static void prv_save_settings_to_file(dleyna_settings_t *settings, GError **error) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dleyna-core-0.4.0/libdleyna/core/settings.h new/dleyna-core-0.5.0/libdleyna/core/settings.h --- old/dleyna-core-0.4.0/libdleyna/core/settings.h 2013-10-03 13:58:05.000000000 +0200 +++ new/dleyna-core-0.5.0/libdleyna/core/settings.h 2014-12-06 12:51:56.000000000 +0100 @@ -35,6 +35,10 @@ gboolean dleyna_settings_is_never_quit(dleyna_settings_t *settings); +guint dleyna_settings_port(dleyna_settings_t *settings); + +guint dleyna_settings_push_host_port(dleyna_settings_t *settings); + void dleyna_settings_set_never_quit(dleyna_settings_t *settings, gboolean never_quit, GError **error); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dleyna-core-0.4.0/libdleyna/core/task-atom.h new/dleyna-core-0.5.0/libdleyna/core/task-atom.h --- old/dleyna-core-0.4.0/libdleyna/core/task-atom.h 2013-05-31 14:28:02.000000000 +0200 +++ new/dleyna-core-0.5.0/libdleyna/core/task-atom.h 2014-12-06 12:51:56.000000000 +0100 @@ -27,7 +27,7 @@ struct dleyna_task_atom_t_ { const dleyna_task_queue_key_t *queue_id; -}; +} __attribute__((aligned)); typedef struct dleyna_task_atom_t_ dleyna_task_atom_t; #endif /* DLEYNA_TASK_ATOM_H__ */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dleyna-core-0.4.0/m4/compiler-flags.m4 new/dleyna-core-0.5.0/m4/compiler-flags.m4 --- old/dleyna-core-0.4.0/m4/compiler-flags.m4 2013-05-31 14:28:02.000000000 +0200 +++ new/dleyna-core-0.5.0/m4/compiler-flags.m4 2014-12-06 12:51:56.000000000 +0100 @@ -52,4 +52,5 @@ fi CFLAGS+=" -Wno-format-extra-args" + CFLAGS+=" -Wl,--no-undefined" ]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dleyna-core-0.4.0/m4/libtool.m4 new/dleyna-core-0.5.0/m4/libtool.m4 --- old/dleyna-core-0.4.0/m4/libtool.m4 2013-10-03 14:22:09.000000000 +0200 +++ new/dleyna-core-0.5.0/m4/libtool.m4 2014-12-06 12:49:27.000000000 +0100 @@ -1312,7 +1312,7 @@ rm -rf conftest* ;; -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ +x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext @@ -1333,7 +1333,10 @@ ;; esac ;; - ppc64-*linux*|powerpc64-*linux*) + powerpc64le-*) + LD="${LD-ld} -m elf32lppclinux" + ;; + powerpc64-*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -1352,7 +1355,10 @@ x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; - ppc*-*linux*|powerpc*-*linux*) + powerpcle-*) + LD="${LD-ld} -m elf64lppc" + ;; + powerpc-*) LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*|s390*-*tpf*) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dleyna-core-0.4.0/m4/log.m4 new/dleyna-core-0.5.0/m4/log.m4 --- old/dleyna-core-0.4.0/m4/log.m4 2013-05-31 14:28:02.000000000 +0200 +++ new/dleyna-core-0.5.0/m4/log.m4 2014-12-06 12:51:56.000000000 +0100 @@ -23,29 +23,21 @@ AC_DEFUN([_DLEYNA_LOG_LEVEL_CHECK_VALUE], [ AS_CASE($1, - [[[1-6]]], [AS_IF([test ${log_array[[${log_level}]]} -ne 0], + [[[1-6]]], [AS_IF([test "x${log_unique}" = xyes], [ - AC_MSG_ERROR(["$1 should be set once"], 1) - ], - [test "x${log_single}" = xyes], - [ - AC_MSG_ERROR(["Unique value element already set"], 1) + AC_MSG_ERROR(["Log levels 0, 7 and 8 cannot be combined with other values"], 1) ]) + let log_level_count++ ], [0|7|8], [AS_IF([test ${log_level_count} -ne 0], [ - AC_MSG_ERROR(["$1 should be a unique value element"], 1) + AC_MSG_ERROR(["Log level $1 cannot be combined with other values"], 1) ]) - log_single=yes + log_unique=yes ], - [AC_MSG_ERROR(["$1 is not a valid value"], 1)] ) - - log_name=LOG_LEVEL_${log_level} - eval log_value=\$${log_name} - let "LOG_LEVEL |= ${log_value}" ] ) @@ -57,19 +49,18 @@ IFS="," log_ok=yes - log_single=no + log_unique=no log_level_count=0 LOG_LEVEL=0 - log_array=(0 0 0 0 0 0 0 0 0) for log_level in $1 do IFS=${old_IFS} _DLEYNA_LOG_LEVEL_CHECK_VALUE([$log_level]) IFS="," - - let log_level_count++ - let log_array[[${log_level}]]++ + log_name=LOG_LEVEL_${log_level} + eval log_value=\$${log_name} + let "LOG_LEVEL |= ${log_value}" done IFS=${old_IFS}