Date: Sat, 9 Apr 2005 22:18:21 -0400 (EDT) From: Michael Johnson <ahze@ahze.net> To: FreeBSD-gnats-submit@FreeBSD.org Cc: lioux@FreeBSD.org Subject: ports/79734: [PATCH] multimedia/libdv: auto-detect gtk1.2 Message-ID: <200504100218.j3A2ILw5010821@blueheron.ahze.net> Resent-Message-ID: <200504100220.j3A2KJR5048999@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 79734
>Category: ports
>Synopsis: [PATCH] multimedia/libdv: auto-detect gtk1.2
>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: Sun Apr 10 02:20:18 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Michael Johnson
>Release: FreeBSD 5.4-STABLE i386
>Organization:
>Environment:
System: FreeBSD blueheron.ahze.net 5.4-STABLE FreeBSD 5.4-STABLE #81: Mon Apr 4 21:13:41 EDT
>Description:
- Auto-detect gtk1.2
>How-To-Repeat:
>Fix:
--- libdv-0.103.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/multimedia/libdv/Makefile,v
retrieving revision 1.25
diff -u -r1.25 Makefile
--- Makefile 23 Jul 2004 19:10:16 -0000 1.25
+++ Makefile 10 Apr 2005 02:14:21 -0000
@@ -18,8 +18,8 @@
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
popt.0:${PORTSDIR}/devel/popt
-USE_GNOME= gnometarget \
- gtk12
+USE_GNOME= gnometarget
+WANT_GNOME= yes
USE_REINPLACE= yes
USE_LIBTOOL_VER=13
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
@@ -27,7 +27,7 @@
PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:${X11BASE}/libdata/pkgconfig
INSTALLS_SHLIB= yes
-MAN1= dubdv.1 dvconnect.1 encodedv.1 playdv.1
+MAN1= dubdv.1 dvconnect.1 encodedv.1
PORTDOCS= AUTHORS COPYING COPYRIGHT ChangeLog NEWS README \
README.dvconnect README.encoder TODO
@@ -38,6 +38,15 @@
IGNORE= "Requires Xv Extension"
.endif
+.if ${HAVE_GNOME:Mgtk12}!=""
+USE_GNOME+= gtk12
+MAN1+= playdv.1
+PLIST_SUB+= GTK=""
+.else
+CONFIGURE_ARGS+=--disable-gtk
+PLIST_SUB+= GTK="@comment "
+.endif
+
# XXX - work around compiler bug
# Optimizations -O{1,s,2,3} work
# However, lack of -O{1,s,2,3} or -O0 BREAK the build
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/multimedia/libdv/pkg-plist,v
retrieving revision 1.8
diff -u -r1.8 pkg-plist
--- pkg-plist 21 Jul 2004 00:33:05 -0000 1.8
+++ pkg-plist 10 Apr 2005 02:14:29 -0000
@@ -1,7 +1,7 @@
bin/dubdv
bin/dvconnect
bin/encodedv
-bin/playdv
+%%GTK%%bin/playdv
include/libdv/dv.h
include/libdv/dv_types.h
lib/libdv.a
--- libdv-0.103.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?200504100218.j3A2ILw5010821>