[134424] trunk/dports/multimedia/hdhomerun_gui
ctreleaven at macports.org
ctreleaven at macports.org
Wed Mar 25 07:13:19 PDT 2015
Revision: 134424
https://trac.macports.org/changeset/134424
Author: ctreleaven at macports.org
Date: 2015-03-25 07:13:19 -0700 (Wed, 25 Mar 2015)
Log Message:
-----------
hdhomerun_gui: bump to v20141210, only use X11 flavour of GTK, fixes 47238
Modified Paths:
--------------
trunk/dports/multimedia/hdhomerun_gui/Portfile
trunk/dports/multimedia/hdhomerun_gui/files/patch-libhdhomerun.diff
Added Paths:
-----------
trunk/dports/multimedia/hdhomerun_gui/files/patch-noQuartz.diff
Modified: trunk/dports/multimedia/hdhomerun_gui/Portfile
===================================================================
--- trunk/dports/multimedia/hdhomerun_gui/Portfile 2015-03-25 14:06:09 UTC (rev 134423)
+++ trunk/dports/multimedia/hdhomerun_gui/Portfile 2015-03-25 14:13:19 UTC (rev 134424)
@@ -3,10 +3,10 @@
PortSystem 1.0
PortGroup app 1.0
+PortGroup active_variants 1.1
name hdhomerun_gui
-version 20140604
-revision 1
+version 20141210
categories multimedia
platforms darwin
license GPL-3
@@ -22,12 +22,13 @@
distname hdhomerun_config_gui_${version}
patchfiles patch-libhdhomerun.diff \
patch-firmware_path.diff \
- patch-missing_frameworks.diff
+ patch-missing_frameworks.diff \
+ patch-noQuartz.diff
patch.args -p1
extract.suffix .tgz
worksrcdir hdhomerun_config_gui
-checksums rmd160 0a43472f32c471d9bb675797e305ad31c02246e0 \
- sha256 aa0b330d99612fe25035074463ac40d1e2d7879040d6d8b3e2e9681032d82208
+checksums rmd160 768cbed2989e3e83e8d398c57b7ca68ff2caea1e \
+ sha256 23460550c6c9a085a6de54032fab8047aed1fe60e473fdb61f6efe124c5461e5
livecheck.type regex
livecheck.url http://www.silicondust.com/support/hdhomerun/downloads/
@@ -38,6 +39,9 @@
depends_run port:VLC \
path:bin/Xquartz:xorg-server
+require_active_variants port:VLC dvb
+require_active_variants port:gtk2 x11
+
post-patch {
reinplace "s|@FIRMWARE_DIR@|${prefix}/share/hdhomerun/|g" \
${worksrcpath}/src/HDHRConfig.cpp
@@ -52,6 +56,8 @@
file attributes ${worksrcpath}/install-sh -permissions +x
}
+use_autoconf yes
+
app.name HDHomerun
app.executable hdhomerun_config_gui
app.icon ${worksrcpath}/OSX/hdhr.icns
Modified: trunk/dports/multimedia/hdhomerun_gui/files/patch-libhdhomerun.diff
===================================================================
--- trunk/dports/multimedia/hdhomerun_gui/files/patch-libhdhomerun.diff 2015-03-25 14:06:09 UTC (rev 134423)
+++ trunk/dports/multimedia/hdhomerun_gui/files/patch-libhdhomerun.diff 2015-03-25 14:13:19 UTC (rev 134424)
@@ -1,7 +1,7 @@
diff -ur hdhomerun_config_gui/Makefile.in.orig hdhomerun_config_gui/Makefile.in
---- hdhomerun_config_gui/Makefile.in.orig 2014-05-19 18:41:10.000000000 -0400
-+++ hdhomerun_config_gui/Makefile.in 2014-10-12 10:42:47.000000000 -0400
-@@ -238,7 +238,7 @@
+--- hdhomerun_config_gui/Makefile.in.orig 2015-03-22 07:46:06.000000000 -0400
++++ hdhomerun_config_gui/Makefile.in 2015-03-22 07:59:13.000000000 -0400
+@@ -304,7 +304,7 @@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
@@ -11,9 +11,9 @@
autogen.sh \
hdhomerun_config.glade \
diff -ur hdhomerun_config_gui/src/Makefile.in.orig hdhomerun_config_gui/src/Makefile.in
---- hdhomerun_config_gui/src/Makefile.in.orig 2014-05-19 18:41:10.000000000 -0400
-+++ hdhomerun_config_gui/src/Makefile.in 2014-10-12 10:37:07.000000000 -0400
-@@ -205,7 +205,6 @@
+--- hdhomerun_config_gui/src/Makefile.in.orig 2015-03-22 07:50:13.000000000 -0400
++++ hdhomerun_config_gui/src/Makefile.in 2015-03-22 07:55:36.000000000 -0400
+@@ -279,7 +279,6 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
INCLUDES = \
@@ -21,7 +21,7 @@
-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
@PACKAGE_CFLAGS@
-@@ -221,7 +220,7 @@
+@@ -295,7 +294,7 @@
HDHRConfig.cpp HDHRConfig.h
hdhomerun_config_gui_LDADD = \
@@ -30,7 +30,7 @@
@PACKAGE_LIBS@ $(INTLLIBS)
all: all-am
-@@ -478,7 +477,7 @@
+@@ -555,7 +554,7 @@
install-dvi-am:
@@ -39,12 +39,12 @@
install-html: install-html-am
-@@ -526,7 +525,7 @@
- distclean-generic distclean-tags distdir dvi dvi-am html \
- html-am info info-am install install-am install-binPROGRAMS \
- install-data install-data-am install-dvi install-dvi-am \
-- install-exec install-exec-am install-exec-local install-html \
-+ install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-ps install-ps-am \
- install-strip installcheck installcheck-am installdirs \
++@@ -604,7 +603,7 @@
++ distdir dvi dvi-am html html-am info info-am install \
++ install-am install-binPROGRAMS install-data install-data-am \
++ install-dvi install-dvi-am install-exec install-exec-am \
++- install-exec-local install-html install-html-am install-info \
+++ install-html install-html-am install-info \
++ install-info-am install-man install-pdf install-pdf-am \
++ install-ps install-ps-am install-strip installcheck \
++ installcheck-am installdirs maintainer-clean \
Added: trunk/dports/multimedia/hdhomerun_gui/files/patch-noQuartz.diff
===================================================================
--- trunk/dports/multimedia/hdhomerun_gui/files/patch-noQuartz.diff (rev 0)
+++ trunk/dports/multimedia/hdhomerun_gui/files/patch-noQuartz.diff 2015-03-25 14:13:19 UTC (rev 134424)
@@ -0,0 +1,42 @@
+diff -ur hdhomerun_config_gui/configure.in.orig work/hdhomerun_config_gui/configure.in
+--- hdhomerun_config_gui/configure.in.orig 2015-03-25 09:12:30.000000000 -0400
++++ hdhomerun_config_gui/configure.in 2015-03-25 09:12:49.000000000 -0400
+@@ -7,7 +7,7 @@
+
+ case ${OSTYPE} in
+ darwin*)
+- LIBS="${LIBS} -framework CoreFoundation -framework CoreServices -lgtkmacintegration"
++ LIBS="${LIBS} -framework CoreFoundation -framework CoreServices"
+ ;;
+ esac
+
+
+diff -u hdhomerun_config_gui/src/main.cpp.orig hdhomerun_config_gui/src/main.cpp
+--- hdhomerun_config_gui/src/main.cpp.orig 2015-03-23 14:56:45.000000000 -0400
++++ hdhomerun_config_gui/src/main.cpp 2015-03-23 14:58:50.000000000 -0400
+@@ -22,14 +22,6 @@
+ gtk_set_locale();
+ gtk_init(&argc, &argv);
+
+-#ifdef __APPLE__
+- GtkosxApplication *osx = (GtkosxApplication *)g_object_new (GTKOSX_TYPE_APPLICATION, NULL);
+- GtkWidget *menubar = gtk_menu_bar_new ();
+- gtkosx_application_set_menu_bar (osx, GTK_MENU_SHELL (menubar));
+- gtkosx_application_set_use_quartz_accelerators (osx, TRUE);
+- gtkosx_application_ready(osx);
+-#endif
+-
+ HDHRConfig HDHomeRunConfig;
+
+ gtk_main();
+diff -u hdhomerun_config_gui/src/Appinclude.h.orig hdhomerun_config_gui/src/Appinclude.h
+--- hdhomerun_config_gui/src/Appinclude.h.orig 2015-03-23 14:57:58.000000000 -0400
++++ hdhomerun_config_gui/src/Appinclude.h 2015-03-23 14:59:26.000000000 -0400
+@@ -13,7 +13,6 @@
+ # include <ApplicationServices/ApplicationServices.h>
+ # include <CoreServices/CoreServices.h>
+ # include <CoreFoundation/CoreFoundation.h>
+-# include <gtkmacintegration/gtkosxapplication.h>
+ #endif
+
+ #include "hdhomerun.h"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150325/69406f3d/attachment-0001.html>
More information about the macports-changes
mailing list