Hello community, here is the log from the commit of package libhdhomerun for openSUSE:Factory checked in at 2014-07-12 17:14:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libhdhomerun (Old) and /work/SRC/openSUSE:Factory/.libhdhomerun.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libhdhomerun" Changes: -------- --- /work/SRC/openSUSE:Factory/libhdhomerun/libhdhomerun.changes 2014-02-02 22:19:57.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libhdhomerun.new/libhdhomerun.changes 2014-07-12 17:14:52.000000000 +0200 @@ -1,0 +2,16 @@ +Wed Jul 9 04:57:11 UTC 2014 - zeke@zekesdominion.com + +- Update package descriptions +- Add URL for firmware update files to hdhomerun_config* package + descriptions +- Remove unnecessary make call in %install + +------------------------------------------------------------------- +Wed Jul 9 04:22:57 UTC 2014 - zeke@zekesdominion.com + +- Update to 20140604. + * Enable scrolling of device list in config GUI. + * Allow more time for firmware upgrade before reporting timeout. + * Add Japanese channel map. + +------------------------------------------------------------------- Old: ---- hdhomerun_config_gui_20140121.tgz libhdhomerun_20140121.tgz New: ---- hdhomerun_config_gui_20140604.tgz libhdhomerun_20140604.tgz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libhdhomerun.spec ++++++ --- /var/tmp/diff_new_pack.zCOJKC/_old 2014-07-12 17:14:53.000000000 +0200 +++ /var/tmp/diff_new_pack.zCOJKC/_new 2014-07-12 17:14:53.000000000 +0200 @@ -23,7 +23,7 @@ BuildRequires: gtk2-devel BuildRequires: pkg-config BuildRequires: update-desktop-files -Version: 20140121 +Version: 20140604 Release: 0 Source0: http://download.silicondust.com/hdhomerun/libhdhomerun_%version.tgz Source1: http://download.silicondust.com/hdhomerun/hdhomerun_config_gui_%version.tgz @@ -37,11 +37,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build %description -HDHomeRun configuration library allows you to discover HDHomeRun -ATSC/QAM/DVB tuners on the network. It can configure the tuners, scan -for channels, and retrieve information including signal strength. A -shared library is included for linking by client applications and a -simple console application is included for scripting. +HDHomeRun configuration library allows you to discover HDHomeRun ATSC/QAM/DVB +TV tuners on the network. It can configure the tuners, scan for channels, and +retrieve information, including signal strength. A shared library is included +for linking by client applications and a simple console application is included +for scripting. %package -n libhdhomerun%{SO_NR} Summary: HDHomeRun library @@ -49,11 +49,11 @@ Group: Productivity/Other %description -n libhdhomerun%{SO_NR} -HDHomeRun configuration library allows you to discover HDHomeRun -ATSC/QAM/DVB tuners on the network. It can configure the tuners, scan -for channels, and retrieve information including signal strength. A -shared library is included for linking by client applications and a -simple console application is included for scripting. +HDHomeRun configuration library allows you to discover HDHomeRun ATSC/QAM/DVB +TV tuners on the network. It can configure the tuners, scan for channels, and +retrieve information, including signal strength. A shared library is included +for linking by client applications and a simple console application is included +for scripting. %package devel Summary: HDHomeRun library @@ -63,11 +63,7 @@ Requires: libhdhomerun%{SO_NR} = %{version} %description devel -HDHomeRun configuration library allows you to discover HDHomeRun -ATSC/QAM/DVB tuners on the network. It can configure the tuners, scan -for channels, and retrieve information including signal strength. A -shared library is included for linking by client applications and a -simple console application is included for scripting. +Development libraries needed to build applications with libhdhomerun. %package -n hdhomerun_config Summary: HDHomeRun Config tool @@ -75,7 +71,10 @@ Group: Productivity/Other %description -n hdhomerun_config -hdhomerun_config is a command line tool to configure an HDHomeRun device. +hdhomerun_config is a command line tool to discover, configure, and scan +HDHomeRun TV tuners. The tool can also be used to update the tuner's firmware. + +Firmware updates can be downloaded from http://www.silicondust.com/support/hdhomerun/downloads/linux %package -n hdhomerun_config_gui Summary: HDHomeRun GTK GUI @@ -84,7 +83,10 @@ Requires: libhdhomerun1 = %{version} %description -n hdhomerun_config_gui -The HDHomerun GTK GUI allows you to discover and configure HDHomerun ATSC/QAM tuners. +The HDHomeRun Config GUI is a GUI tool to discover, configure, and scan +HDHomeRun TV tuners. The tool can also be used to update the tuner's firmware. + +Firmware updates can be downloaded from http://www.silicondust.com/support/hdhomerun/downloads/linux %prep %setup -q -b 1 -n hdhomerun_config_gui @@ -97,8 +99,6 @@ make all %install -make DESTDIR=%buildroot - mkdir -p %buildroot/%{_bindir} mkdir -p %buildroot/%{_libdir} mkdir -p %buildroot/%{_includedir}/libhdhomerun ++++++ hdhomerun_config_gui_20140121.tgz -> hdhomerun_config_gui_20140604.tgz ++++++ ++++ 13062 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/hdhomerun_config_gui/Makefile.am new/hdhomerun_config_gui/Makefile.am --- old/hdhomerun_config_gui/Makefile.am 2013-05-03 23:14:07.000000000 +0200 +++ new/hdhomerun_config_gui/Makefile.am 2014-05-20 00:41:10.000000000 +0200 @@ -1,9 +1,10 @@ ## Process this file with automake to produce Makefile.in -SUBDIRS = ../libhdhomerun src po +SUBDIRS = ../libhdhomerun src EXTRA_DIST = \ autogen.sh \ hdhomerun_config.glade \ hdhomerun_config.gladep +.NOTPARALLEL: clean 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/hdhomerun_config_gui/OSX/Info.plist new/hdhomerun_config_gui/OSX/Info.plist --- old/hdhomerun_config_gui/OSX/Info.plist 2013-05-03 23:14:07.000000000 +0200 +++ new/hdhomerun_config_gui/OSX/Info.plist 2014-05-20 00:41:10.000000000 +0200 @@ -5,15 +5,13 @@ <key>CFBundleDevelopmentRegion</key> <string>English</string> <key>CFBundleExecutable</key> - <string>${EXECUTABLE_NAME}</string> + <string>hdhomerun_config_gui</string> <key>CFBundleIconFile</key> <string>hdhr.icns</string> <key>CFBundleIdentifier</key> <string>com.silicondust.hdhomerun.config.gui</string> <key>CFBundleInfoDictionaryVersion</key> <string>6.0</string> - <key>CFBundleName</key> - <string>${PRODUCT_NAME}</string> <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleSignature</key> @@ -22,5 +20,7 @@ <string>1.0</string> <key>NSHumanReadableCopyright</key> <string> Copyright © 2008 Silicondust USA Inc. <www.silicondust.com>.</string> + <key>NSAppSleepDisabled</key> + <true/> </dict> </plist> 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/hdhomerun_config_gui/OSX/hdhomerun_config_gui.bundle new/hdhomerun_config_gui/OSX/hdhomerun_config_gui.bundle --- old/hdhomerun_config_gui/OSX/hdhomerun_config_gui.bundle 1970-01-01 01:00:00.000000000 +0100 +++ new/hdhomerun_config_gui/OSX/hdhomerun_config_gui.bundle 2014-05-20 02:38:07.000000000 +0200 @@ -0,0 +1,32 @@ +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*--> +<app-bundle> + <meta> + <prefix name="default">${env:JHBUILD_PREFIX}</prefix> + <destination overwrite="yes">${project}/build/Release</destination> + <run-install-name-tool/> + <gtk>gtk+-2.0</gtk> + </meta> + <plist>${project}/Info.plist</plist> + <main-binary dest="${bundle}/bin/hdhomerun_config_gui">${project}/../src/hdhomerun_config_gui</main-binary> + <binary> + ${prefix}/lib/${gtkdir}/${pkg:${gtk}:gtk_binary_version}/engines/*.so + </binary> + <binary> + ${prefix}/lib/gdk-pixbuf-2.0/${pkg:gdk-pixbuf-2.0:gdk_pixbuf_binary_version}/loaders/*.so + </binary> + <binary dest="${bundle}/Contents/Resources/lib/libhdhomerun.dylib"> + ${project}/../../libhdhomerun/libhdhomerun.dylib + </binary> + <binary> + ${prefix}/lib/pango/${pkg:pango:pango_module_version}/modules/ + </binary> + <data> + ${prefix}/share/themes/Clearlooks + </data> + <data dest="${bundle}/Contents/Resources"> + ${project}/hdhr.icns + </data> + <data dest="${bundle}/Contents/Resources/etc/gtk-2.0/gtkrc"> + ${prefix}/share/themes/Clearlooks/gtk-2.0/gtkrc + </data> +</app-bundle> 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/hdhomerun_config_gui/OSX/hdhomerun_config_gui.xcodeproj/project.pbxproj new/hdhomerun_config_gui/OSX/hdhomerun_config_gui.xcodeproj/project.pbxproj --- old/hdhomerun_config_gui/OSX/hdhomerun_config_gui.xcodeproj/project.pbxproj 2013-05-03 23:14:07.000000000 +0200 +++ new/hdhomerun_config_gui/OSX/hdhomerun_config_gui.xcodeproj/project.pbxproj 2014-05-20 00:41:10.000000000 +0200 @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 42; + objectVersion = 46; objects = { /* Begin PBXBuildFile section */ @@ -23,7 +23,6 @@ 1C896C1B0EE52F7F003F0DF5 /* libhdhomerun.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 1CB9B63C0EE3505A00F782E9 /* libhdhomerun.dylib */; }; 1C9F00050EECA6180099AAB3 /* hdhr.icns in Resources */ = {isa = PBXBuildFile; fileRef = 1C9FFFFE0EECA5210099AAB3 /* hdhr.icns */; }; 1CB9B63D0EE3505A00F782E9 /* libhdhomerun.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 1CB9B63C0EE3505A00F782E9 /* libhdhomerun.dylib */; settings = {ATTRIBUTES = (Required, ); }; }; - 1CB9B6850EE35C5800F782E9 /* libhdhomerun.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 1CB9B63C0EE3505A00F782E9 /* libhdhomerun.dylib */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -88,7 +87,6 @@ 15409F790DCB9D7A00BC6E83 /* Gtk.framework in Frameworks */, 15409F7D0DCB9D8800BC6E83 /* Cairo.framework in Frameworks */, 1CB9B63D0EE3505A00F782E9 /* libhdhomerun.dylib in Frameworks */, - 1CB9B6850EE35C5800F782E9 /* libhdhomerun.dylib in Frameworks */, 1C89205E0F7C844E00B14F4B /* CoreServices.framework in Frameworks */, 1C8921180F7C846700B14F4B /* ApplicationServices.framework in Frameworks */, ); @@ -209,9 +207,16 @@ /* Begin PBXProject section */ 29B97313FDCFA39411CA2CEA /* Project object */ = { isa = PBXProject; + attributes = { + LastUpgradeCheck = 0510; + }; buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "hdhomerun_config_gui" */; - compatibilityVersion = "Xcode 2.4"; + compatibilityVersion = "Xcode 3.2"; + developmentRegion = English; hasScannedForEncodings = 1; + knownRegions = ( + en, + ); mainGroup = 29B97314FDCFA39411CA2CEA /* hdhomerun_config_gui */; projectDirPath = ""; projectRoot = ""; @@ -311,58 +316,39 @@ C01FCF4B08A954540054247B /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - COPY_PHASE_STRIP = NO; - GCC_DYNAMIC_NO_PIC = NO; + FRAMEWORK_SEARCH_PATHS = /Library/Frameworks; GCC_ENABLE_FIX_AND_CONTINUE = YES; - GCC_MODEL_TUNING = G5; - GCC_OPTIMIZATION_LEVEL = 0; + HEADER_SEARCH_PATHS = ( + "$(SRCROOT)/../../libhdhomerun", + /Library/Frameworks/Cairo.framework/Headers, + /Library/Frameworks/GLib.framework/Headers, + /Library/Frameworks/Gtk.framework/Headers, + ); INFOPLIST_FILE = Info.plist; - INSTALL_PATH = "$(HOME)/Applications"; LIBRARY_SEARCH_PATHS = ( "$(inherited)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_4)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_5)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_6)", + "$(SRCROOT)/../../libhdhomerun", ); - LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)\""; - LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)/libhdhomerun\""; - LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3 = "\"$(SRCROOT)/../../libhdhomerun\""; - LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_4 = "\"$(SRCROOT)\""; - LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_5 = "\"$(SRCROOT)/../../libhdhomerun\""; - LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_6 = "\"$(SRCROOT)/build/Debug\""; PRODUCT_NAME = hdhomerun_config_gui; - WRAPPER_EXTENSION = app; - ZERO_LINK = YES; }; name = Debug; }; C01FCF4C08A954540054247B /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - GCC_GENERATE_DEBUGGING_SYMBOLS = NO; - GCC_MODEL_TUNING = G5; + FRAMEWORK_SEARCH_PATHS = /Library/Frameworks; + HEADER_SEARCH_PATHS = ( + "$(SRCROOT)/../../libhdhomerun", + /Library/Frameworks/Cairo.framework/Headers, + /Library/Frameworks/GLib.framework/Headers, + /Library/Frameworks/Gtk.framework/Headers, + ); INFOPLIST_FILE = Info.plist; - INSTALL_PATH = "$(HOME)/Applications"; LIBRARY_SEARCH_PATHS = ( "$(inherited)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_4)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_5)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_6)", + "$(SRCROOT)/../../libhdhomerun", ); - LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)\""; - LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)/libhdhomerun\""; - LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3 = "\"$(SRCROOT)/../../libhdhomerun\""; - LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_4 = "\"$(SRCROOT)\""; - LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_5 = "\"$(SRCROOT)/../../libhdhomerun\""; - LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_6 = "\"$(SRCROOT)/build/Debug\""; PRODUCT_NAME = hdhomerun_config_gui; - WRAPPER_EXTENSION = app; }; name = Release; }; @@ -371,17 +357,12 @@ buildSettings = { /Library/Frameworks/Cairo.framework/Headers = /Library/Frameworks/Cairo.framework/Headers; /Library/Frameworks/GLib.framework/Headers = /Library/Frameworks/GLib.framework/Headers; - ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)"; - ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386"; - GCC_WARN_ABOUT_RETURN_TYPE = YES; - GCC_WARN_UNUSED_VARIABLE = YES; + ARCHS = "$(ARCHS_STANDARD_32_BIT)"; HEADER_SEARCH_PATHS = ( /Library/Frameworks/Cairo.framework/Headers, /Library/Frameworks/GLib.framework/Headers, /Library/Frameworks/Gtk.framework/Headers, ); - PREBINDING = NO; - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; }; name = Debug; }; @@ -390,17 +371,12 @@ buildSettings = { /Library/Frameworks/Cairo.framework/Headers = /Library/Frameworks/Cairo.framework/Headers; /Library/Frameworks/GLib.framework/Headers = /Library/Frameworks/GLib.framework/Headers; - ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)"; - ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386"; - GCC_WARN_ABOUT_RETURN_TYPE = YES; - GCC_WARN_UNUSED_VARIABLE = YES; + ARCHS = "$(ARCHS_STANDARD_32_BIT)"; HEADER_SEARCH_PATHS = ( /Library/Frameworks/Cairo.framework/Headers, /Library/Frameworks/GLib.framework/Headers, /Library/Frameworks/Gtk.framework/Headers, ); - PREBINDING = NO; - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; }; name = Release; }; 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/hdhomerun_config_gui/config.h.in new/hdhomerun_config_gui/config.h.in --- old/hdhomerun_config_gui/config.h.in 2013-05-03 23:14:07.000000000 +0200 +++ new/hdhomerun_config_gui/config.h.in 2014-05-20 00:41:10.000000000 +0200 @@ -63,6 +63,9 @@ /* Define to the one symbol short name of this package. */ #undef PACKAGE_TARNAME +/* Define to the home page for this package. */ +#undef PACKAGE_URL + /* Define to the version of this package. */ #undef PACKAGE_VERSION 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/hdhomerun_config_gui/configure.in new/hdhomerun_config_gui/configure.in --- old/hdhomerun_config_gui/configure.in 2013-05-03 23:14:06.000000000 +0200 +++ new/hdhomerun_config_gui/configure.in 2014-05-20 00:41:10.000000000 +0200 @@ -5,10 +5,16 @@ AM_CONFIG_HEADER(config.h) AM_MAINTAINER_MODE +case ${OSTYPE} in +darwin*) + LIBS="${LIBS} -framework CoreFoundation -framework CoreServices" + ;; +esac + #AC_ISC_POSIX -#AC_PROG_CC -#AM_PROG_CC_STDC -#AC_HEADER_STDC +AC_PROG_CC +AM_PROG_CC_STDC +AC_HEADER_STDC AC_PROG_CXX pkg_modules="gtk+-2.0 >= 2.0.0 gthread-2.0" 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/hdhomerun_config_gui/po/Makefile.in.in new/hdhomerun_config_gui/po/Makefile.in.in --- old/hdhomerun_config_gui/po/Makefile.in.in 2013-05-03 23:14:07.000000000 +0200 +++ new/hdhomerun_config_gui/po/Makefile.in.in 2014-05-20 00:41:10.000000000 +0200 @@ -16,7 +16,7 @@ PACKAGE = @PACKAGE@ VERSION = @VERSION@ -SHELL = /bin/sh +SHELL = @SHELL@ @SET_MAKE@ srcdir = @srcdir@ @@ -35,7 +35,7 @@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ -MKINSTALLDIRS = $(top_srcdir)/@MKINSTALLDIRS@ +MKINSTALLDIRS = mkdir -p CC = @CC@ GENCAT = @GENCAT@ @@ -79,7 +79,7 @@ $(MSGFMT) -o $@ $< .po.gmo: - file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \ + $(AM_V_GEN) file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \ && rm -f $$file && $(GMSGFMT) $(MSGFMT_OPTS) -o $$file $< .po.cat: @@ -93,8 +93,18 @@ all-no: $(srcdir)/$(GETTEXT_PACKAGE).pot: $(POTFILES) - $(XGETTEXT) --default-domain=$(GETTEXT_PACKAGE) --directory=$(top_srcdir) \ + $(XGETTEXT) --default-domain=$(GETTEXT_PACKAGE) \ + --msgid-bugs-address='http://bugzilla.gnome.org/enter_bug.cgi?product=glib&keywords=I18N+L10N&component=general' \ --add-comments --keyword=_ --keyword=N_ \ + --keyword=C_:1c,2 \ + --keyword=NC_:1c,2 \ + --keyword=g_dcgettext:2 \ + --keyword=g_dngettext:2,3 \ + --keyword=g_dpgettext2:2c,3 \ + --flag=N_:1:pass-c-format \ + --flag=C_:2:pass-c-format \ + --flag=NC_:2:pass-c-format \ + --flag=g_dngettext:2:pass-c-format \ --flag=g_strdup_printf:1:c-format \ --flag=g_string_printf:2:c-format \ --flag=g_string_append_printf:2:c-format \ @@ -110,7 +120,7 @@ --flag=g_snprintf:3:c-format \ --flag=g_scanner_error:2:c-format \ --flag=g_scanner_warn:2:c-format \ - --files-from=$(srcdir)/POTFILES.in \ + $(POTFILES) \ && test ! -f $(GETTEXT_PACKAGE).po \ || ( rm -f $(srcdir)/$(GETTEXT_PACKAGE).pot \ && mv $(GETTEXT_PACKAGE).po $(srcdir)/$(GETTEXT_PACKAGE).pot ) @@ -120,12 +130,8 @@ install-data: install-data-@USE_NLS@ install-data-no: all install-data-yes: all - if test -r "$(MKINSTALLDIRS)"; then \ - $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \ - else \ - $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir); \ - fi - @catalogs='$(CATALOGS)'; \ + $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \ + catalogs='$(CATALOGS)'; \ for cat in $$catalogs; do \ cat=`basename $$cat`; \ case "$$cat" in \ @@ -134,11 +140,7 @@ esac; \ lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \ dir=$(DESTDIR)$$destdir/$$lang/LC_MESSAGES; \ - if test -r "$(MKINSTALLDIRS)"; then \ - $(MKINSTALLDIRS) $$dir; \ - else \ - $(SHELL) $(top_srcdir)/mkinstalldirs $$dir; \ - fi; \ + $(MKINSTALLDIRS) $$dir; \ if test -r $$cat; then \ $(INSTALL_DATA) $$cat $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \ echo "installing $$cat as $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT)"; \ @@ -162,11 +164,7 @@ fi; \ done if test "$(PACKAGE)" = "glib"; then \ - if test -r "$(MKINSTALLDIRS)"; then \ - $(MKINSTALLDIRS) $(DESTDIR)$(gettextsrcdir); \ - else \ - $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(gettextsrcdir); \ - fi; \ + $(MKINSTALLDIRS) $(DESTDIR)$(gettextsrcdir); \ $(INSTALL_DATA) $(srcdir)/Makefile.in.in \ $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \ else \ @@ -209,7 +207,7 @@ rm -f $(GMOFILES) distdir = ../$(GETTEXT_PACKAGE)-$(VERSION)/$(subdir) -dist distdir: update-po $(DISTFILES) +dist distdir: $(DISTFILES) dists="$(DISTFILES)"; \ for file in $$dists; do \ ln $(srcdir)/$$file $(distdir) 2> /dev/null \ @@ -263,8 +261,7 @@ Makefile: Makefile.in.in ../config.status POTFILES cd .. \ - && CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \ - $(SHELL) ./config.status + && $(SHELL) ./config.status $(subdir)/$@.in # Tell versions [3.59,3.63) of GNU make not to export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. 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/hdhomerun_config_gui/src/HDHRConfig.cpp new/hdhomerun_config_gui/src/HDHRConfig.cpp --- old/hdhomerun_config_gui/src/HDHRConfig.cpp 2013-05-03 23:14:06.000000000 +0200 +++ new/hdhomerun_config_gui/src/HDHRConfig.cpp 2014-06-02 23:50:42.000000000 +0200 @@ -44,6 +44,7 @@ HDHRConfigH = this; /* Device */ + scrolledwindow1 = GTK_SCROLLED_WINDOW(lookup_widget("scrolledwindow1")); DeviceListTree = GTK_TREE_VIEW(lookup_widget("DeviceListTree")); DeviceListStore = gtk_list_store_new(1, G_TYPE_STRING); @@ -125,6 +126,7 @@ gtk_combo_box_set_active(ChannelMapEdit, 0); UpdateProgramListEntry(999, "XXXXXXXXXXXX"); gtk_combo_box_set_active(ProgramList, 0); + gtk_scrolled_window_set_policy(scrolledwindow1, GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); /* The window must me mapped or the sizes will be incorrect */ gtk_widget_show(GTK_WIDGET(hdhomerun_config)); 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/hdhomerun_config_gui/src/HDHRConfig.h new/hdhomerun_config_gui/src/HDHRConfig.h --- old/hdhomerun_config_gui/src/HDHRConfig.h 2013-05-03 23:14:06.000000000 +0200 +++ new/hdhomerun_config_gui/src/HDHRConfig.h 2014-06-02 23:50:42.000000000 +0200 @@ -42,6 +42,7 @@ GtkWindow *hdhomerun_config; /* Device */ + GtkScrolledWindow *scrolledwindow1; GtkTreeView *DeviceListTree; GtkListStore *DeviceListStore; 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/hdhomerun_config_gui/src/interface.cpp new/hdhomerun_config_gui/src/interface.cpp --- old/hdhomerun_config_gui/src/interface.cpp 2013-05-03 23:14:06.000000000 +0200 +++ new/hdhomerun_config_gui/src/interface.cpp 2014-06-02 23:50:42.000000000 +0200 @@ -32,7 +32,7 @@ GtkWidget *hbox1; GtkWidget *frame1; GtkWidget *vbox2; - GtkWidget *viewport1; + GtkWidget *scrolledwindow1; GtkWidget *DeviceListTree; GtkWidget *RescanBtn; GtkWidget *label1; @@ -96,13 +96,13 @@ gtk_container_add(GTK_CONTAINER(frame1), vbox2); gtk_container_set_border_width(GTK_CONTAINER(vbox2), 3); - viewport1 = gtk_viewport_new(NULL, NULL); - gtk_widget_show(viewport1); - gtk_box_pack_start(GTK_BOX(vbox2), viewport1, TRUE, TRUE, 0); + scrolledwindow1 = gtk_scrolled_window_new(NULL, NULL); + gtk_widget_show(scrolledwindow1); + gtk_box_pack_start(GTK_BOX(vbox2), scrolledwindow1, TRUE, TRUE, 0); DeviceListTree = gtk_tree_view_new(); gtk_widget_show(DeviceListTree); - gtk_container_add(GTK_CONTAINER(viewport1), DeviceListTree); + gtk_container_add(GTK_CONTAINER(scrolledwindow1), DeviceListTree); gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(DeviceListTree), FALSE); gtk_tree_view_set_enable_search(GTK_TREE_VIEW(DeviceListTree), FALSE); @@ -331,7 +331,7 @@ GLADE_HOOKUP_OBJECT(hdhomerun_config, hbox1, "hbox1"); GLADE_HOOKUP_OBJECT(hdhomerun_config, frame1, "frame1"); GLADE_HOOKUP_OBJECT(hdhomerun_config, vbox2, "vbox2"); - GLADE_HOOKUP_OBJECT(hdhomerun_config, viewport1, "viewport1"); + GLADE_HOOKUP_OBJECT(hdhomerun_config, scrolledwindow1, "scrolledwindow1"); GLADE_HOOKUP_OBJECT(hdhomerun_config, DeviceListTree, "DeviceListTree"); GLADE_HOOKUP_OBJECT(hdhomerun_config, RescanBtn, "RescanBtn"); GLADE_HOOKUP_OBJECT(hdhomerun_config, label1, "label1"); ++++++ libhdhomerun_20140121.tgz -> libhdhomerun_20140604.tgz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libhdhomerun/Makefile new/libhdhomerun/Makefile --- old/libhdhomerun/Makefile 2013-05-03 23:14:06.000000000 +0200 +++ new/libhdhomerun/Makefile 2014-05-20 00:41:10.000000000 +0200 @@ -32,7 +32,7 @@ LDFLAGS += -lsocket endif ifeq ($(OS),Darwin) - CFLAGS += -arch i386 -arch ppc + CFLAGS += -arch i386 -arch x86_64 LIBEXT := .dylib SHARED := -dynamiclib -install_name libhdhomerun$(LIBEXT) endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libhdhomerun/hdhomerun_channels.c new/libhdhomerun/hdhomerun_channels.c --- old/libhdhomerun/hdhomerun_channels.c 2014-01-16 20:01:59.000000000 +0100 +++ new/libhdhomerun/hdhomerun_channels.c 2014-03-17 00:43:16.000000000 +0100 @@ -77,6 +77,12 @@ { 0, 0, 0, 0} }; +/* JP antenna channels. */ +static const struct hdhomerun_channelmap_range_t hdhomerun_channelmap_range_jp_bcast[] = { + { 13, 62, 473000000, 6000000}, + { 0, 0, 0, 0} +}; + /* US antenna channels. */ static const struct hdhomerun_channelmap_range_t hdhomerun_channelmap_range_us_bcast[] = { { 2, 4, 57000000, 6000000}, @@ -140,7 +146,8 @@ {"us-hrc", hdhomerun_channelmap_range_us_hrc , "us-cable us-hrc us-irc", NULL}, {"us-irc", hdhomerun_channelmap_range_us_irc, "us-cable us-hrc us-irc", NULL}, - {NULL, NULL, NULL, NULL} + {"jp-bcast", hdhomerun_channelmap_range_jp_bcast, "jp-bcast", "JP" }, + { NULL, NULL, NULL, NULL } }; const char *hdhomerun_channelmap_get_channelmap_from_country_source(const char *countrycode, const char *source, const char *supported) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libhdhomerun/hdhomerun_control.c new/libhdhomerun/hdhomerun_control.c --- old/libhdhomerun/hdhomerun_control.c 2014-01-16 20:01:59.000000000 +0100 +++ new/libhdhomerun/hdhomerun_control.c 2014-02-12 19:12:57.000000000 +0100 @@ -23,7 +23,7 @@ #define HDHOMERUN_CONTROL_CONNECT_TIMEOUT 2500 #define HDHOMERUN_CONTROL_SEND_TIMEOUT 2500 #define HDHOMERUN_CONTROL_RECV_TIMEOUT 2500 -#define HDHOMERUN_CONTROL_UPGRADE_TIMEOUT 20000 +#define HDHOMERUN_CONTROL_UPGRADE_TIMEOUT 30000 struct hdhomerun_control_sock_t { uint32_t desired_device_id; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libhdhomerun/hdhomerun_os_windows.h new/libhdhomerun/hdhomerun_os_windows.h --- old/libhdhomerun/hdhomerun_os_windows.h 2014-01-16 20:01:59.000000000 +0100 +++ new/libhdhomerun/hdhomerun_os_windows.h 2014-02-21 21:06:14.000000000 +0100 @@ -53,7 +53,10 @@ typedef HANDLE pthread_t; typedef HANDLE pthread_mutex_t; +#if !defined(va_copy) #define va_copy(x, y) x = y +#endif + #define atoll _atoi64 #define strdup _strdup #define strcasecmp _stricmp -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org