Date: Sun, 13 Jun 2004 18:57:44 -0500 (CDT) From: Jonathan Noack <noackj@concordiacrusaders.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: riggs@rrr.de Subject: ports/67913: [PATCH] multimedia/mplayer-gtk-esound: fix build if WITH_GTK2 defined Message-ID: <200406132357.i5DNviWB035426@compgeek.noacks.org> Resent-Message-ID: <200406140000.i5E00kCo087607@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 67913
>Category: ports
>Synopsis: [PATCH] multimedia/mplayer-gtk-esound: fix build if WITH_GTK2 defined
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Mon Jun 14 00:00:46 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator: Jonathan Noack
>Release: FreeBSD 5.2-CURRENT i386
>Organization:
Concordia Lutheran High School
>Environment:
System: FreeBSD compgeek.noacks.org 5.2-CURRENT FreeBSD 5.2-CURRENT #20: Sat Jun 12 05:07:01 CDT 2004
>Description:
Building mplayer with WITH_GTK2 defined dies with errors on line 925
of vidix/drivers/radeon_vid.c ('Display' undefined or something). I
think GTK detection "falls through the cracks" and CFLAGS are set
incorrectly. The attached patch makes it just fall back to WITH_GTK1.
Other ports use the WITH_GTK2 knob (I have it in /etc/make.conf), so
we should either fall back to GTK1 or fail. If it were to just fail,
most users would manually define WITH_GTK1 anyway and try again, so I
think falling back to GTK1 is the best option. However, I can
understand why some may not like it bringing in dependencies they
didn't ask for. This does at least print that it's using GTK1...
Port maintainer (riggs@rrr.de) is cc'd.
Generated with FreeBSD Port Tools 0.50
>How-To-Repeat:
>Fix:
--- mplayer-gtk-esound-0.99.4.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/multimedia/mplayer/Makefile,v
retrieving revision 1.95
diff -u -r1.95 Makefile
--- Makefile 11 Jun 2004 21:48:48 -0000 1.95
+++ Makefile 13 Jun 2004 23:48:09 -0000
@@ -43,8 +43,8 @@
# gui capabilities.
# The GTK2 patches are not official ones, so they should be considered as
# experimental.
-# Note: GTK2 patches are not included at the moment. So defining this knob has
-# no effect until new working patches are available
+# Note: GTK2 patches are not included at the moment. Defining this knob will
+# use GTK1 until new working patches are available
#
# WITHOUT_GUI
# default: undefined
@@ -367,6 +367,9 @@
PLIST_SUB+= GMPLAYER="@comment "
.endif
+.if defined(WITH_GTK2)
+WITH_GTK1= yes
+.endif
#.if defined(WITH_GTK2) && !defined(WITHOUT_GUI)
#USE_GNOME+= gtk20
#RUN_DEPENDS+= ${LOCALBASE}/share/mplayer/Skin:${PORTSDIR}/multimedia/mplayer-skins
@@ -607,6 +610,12 @@
@${ECHO_MSG} "make WITH_GTK1
@${ECHO_MSG} "builds MPlayer with GTK1-GUI support."
+.if defined(WITH_GTK2)
+ @${ECHO_MSG} ""
+ @${ECHO_MSG} "WITH_GTK2 not yet available -- defining WITH_GTK1 instead"
+ @${ECHO_MSG} ""
+.endif
+
.if !defined(WITHOUT_GUI)
@${ECHO_MSG} "If you want to use the GUI, you can either install"
@${ECHO_MSG} "${PORTSDIR}/multimedia/mplayer-skins"
--- mplayer-gtk-esound-0.99.4.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200406132357.i5DNviWB035426>