Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 28 Jan 2002 10:56:40 -0800 (PST)
From:      KATO Tsuguru <tkato@prontomail.com>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/34381: Update port: graphics/libxine
Message-ID:  <200201281856.g0SIueX00164@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         34381
>Category:       ports
>Synopsis:       Update port: graphics/libxine
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jan 28 11:00:05 PST 2002
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        4.4-RELEASE i386
>Organization:
>Environment:
>Description:
- Support PTHREAD_CFLAGS/PTHREAD_LIBS properly
- Fix pkg-comment format
- Avoid installing useless .la files

New file:
files/patch-ltmain.sh
files/patch-src:libw32dll:wine:Makefile.am

>How-To-Repeat:

>Fix:
diff -urN /usr/ports/graphics/libxine/Makefile graphics/libxine/Makefile
--- /usr/ports/graphics/libxine/Makefile	Mon Jan 28 19:23:05 2002
+++ graphics/libxine/Makefile	Mon Jan 28 23:08:38 2002
@@ -7,6 +7,7 @@
 
 PORTNAME=	xine
 PORTVERSION=	0.9.8
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://xine.sourceforge.net/files/ \
 		${MASTER_SITE_SOURCEFORGE}
@@ -22,15 +23,17 @@
 		intl.1:${PORTSDIR}/devel/gettext
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-lib-${PORTVERSION}
-CONFIGURE_ARGS=	--with-w32-path=${LOCALBASE}/lib/win32
-CONFIGURE_ENV=	CPPFLAGS="-I.. -I${LOCALBASE}/include" \
-		LIBS=-L${LOCALBASE}/lib
 
-USE_AUTOMAKE=	yes
-USE_GMAKE=	yes
 USE_X_PREFIX=	yes
-USE_IMLIB=	yes
 USE_ESOUND=	yes
+USE_IMLIB=	yes
+USE_GMAKE=	yes
+USE_AUTOMAKE=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib" \
+		THREAD_CFLAGS="${PTHREAD_CFLAGS}" \
+		THREAD_LIBS="${PTHREAD_LIBS}"
+CONFIGURE_ARGS=	--with-w32-path=${LOCALBASE}/lib/win32
 INSTALLS_SHLIB=	yes
 
 MAN1=		xine-config.1
@@ -75,9 +78,17 @@
 PLIST_SUB+=	HAVE_OGG="@comment "
 .endif
 
-# XXX: To avoid internal error in gcc.
-post-configure:
-	@${SED} -e "s/-funroll-loops//" < ${WRKSRC}/src/libw32dll/wine/Makefile > ${WRKSRC}/src/libw32dll/wine/Makefile.tmp
-	@${MV} ${WRKSRC}/src/libw32dll/wine/Makefile.tmp ${WRKSRC}/src/libw32dll/wine/Makefile
+post-patch:
+	@${PERL} -pi -e \
+		's|THREAD_LIBS=.*$$|THREAD_LIBS="\$$THREAD_LIBS"|g ; \
+		 s|THREAD_CFLAGS=.*$$|THREAD_CFLAGS="\$$THREAD_CFLAGS"|g ; \
+		 s|-L/usr/local/lib||g ; \
+		 s|-I/usr/local/include||g ; \
+		 s|-funroll-loops||g' ${WRKSRC}/configure.in
+	@${PERL} -pi -e \
+		's|aclocal,|${ACLOCAL},|g ; \
+		 s|autoconf,|${AUTOCONF},|g ; \
+		 s|automake,|${AUTOMAKE},|g ; \
+		 s|autoheader,|${AUTOHEADER},|g' ${WRKSRC}/aclocal.m4
 
 .include <bsd.port.post.mk>
diff -urN /usr/ports/graphics/libxine/files/patch-ltmain.sh graphics/libxine/files/patch-ltmain.sh
--- /usr/ports/graphics/libxine/files/patch-ltmain.sh	Thu Jan  1 09:00:00 1970
+++ graphics/libxine/files/patch-ltmain.sh	Sat Jan 26 00:00:00 2002
@@ -0,0 +1,23 @@
+--- ltmain.sh.orig	Wed Jan 16 09:00:24 2002
++++ ltmain.sh	Fri Jan 25 05:08:03 2002
+@@ -958,6 +958,7 @@
+ 	;;
+ 
+       -avoid-version)
++	build_old_libs=no
+ 	avoid_version=yes
+ 	continue
+ 	;;
+@@ -4247,10 +4248,12 @@
+ 	fi
+ 
+ 	# Install the pseudo-library for information purposes.
++	if /usr/bin/false; then
+ 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ 	instname="$dir/$name"i
+ 	$show "$install_prog $instname $destdir/$name"
+ 	$run eval "$install_prog $instname $destdir/$name" || exit $?
++	fi
+ 
+ 	# Maybe install the static library, too.
+ 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff -urN /usr/ports/graphics/libxine/files/patch-src:libw32dll:wine:Makefile.am graphics/libxine/files/patch-src:libw32dll:wine:Makefile.am
--- /usr/ports/graphics/libxine/files/patch-src:libw32dll:wine:Makefile.am	Thu Jan  1 09:00:00 1970
+++ graphics/libxine/files/patch-src:libw32dll:wine:Makefile.am	Mon Jan 28 23:07:52 2002
@@ -0,0 +1,11 @@
+--- src/libw32dll/wine/Makefile.am.orig	Fri Jan 11 04:59:51 2002
++++ src/libw32dll/wine/Makefile.am	Mon Jan 28 23:07:30 2002
+@@ -4,6 +4,8 @@
+ 
+ ##
+ ##
++INCLUDES = @INCLUDES@ -I$(srcdir)/..
++
+ CFLAGS = @GLOBAL_CFLAGS@ @X_CFLAGS@ -fno-omit-frame-pointer \
+ 	-Wmissing-prototypes -Wimplicit-function-declaration \
+ 	-DWIN32_PATH=\"@w32_path@\" -I$(srcdir)/.. -D__WINE__ \
diff -urN /usr/ports/graphics/libxine/pkg-comment graphics/libxine/pkg-comment
--- /usr/ports/graphics/libxine/pkg-comment	Thu Sep 20 16:49:19 2001
+++ graphics/libxine/pkg-comment	Tue Jan 29 03:53:32 2002
@@ -1 +1 @@
-xine UNIX video player library
+Libraries for xine UNIX video player
diff -urN /usr/ports/graphics/libxine/pkg-plist graphics/libxine/pkg-plist
--- /usr/ports/graphics/libxine/pkg-plist	Thu Jan 24 18:19:36 2002
+++ graphics/libxine/pkg-plist	Sat Jan 26 00:00:00 2002
@@ -22,87 +22,47 @@
 include/xine/xineintl.h
 include/xine/xineutils.h
 include/xine.h
-lib/libxine.la
 lib/libxine.so
 lib/libxine.so.0
-lib/libxineutils.la
 lib/libxineutils.so
 lib/libxineutils.so.0
-%%HAVE_ARTS%%lib/xine/plugins/xineplug_ao_out_arts.la
 %%HAVE_ARTS%%lib/xine/plugins/xineplug_ao_out_arts.so
-lib/xine/plugins/xineplug_ao_out_esd.la
 lib/xine/plugins/xineplug_ao_out_esd.so
-lib/xine/plugins/xineplug_ao_out_oss.la
 lib/xine/plugins/xineplug_ao_out_oss.so
-lib/xine/plugins/xineplug_decode_a52.la
 lib/xine/plugins/xineplug_decode_a52.so
-lib/xine/plugins/xineplug_decode_divx4.la
 lib/xine/plugins/xineplug_decode_divx4.so
-lib/xine/plugins/xineplug_decode_dts.la
 lib/xine/plugins/xineplug_decode_dts.so
-lib/xine/plugins/xineplug_decode_vfill.la
 lib/xine/plugins/xineplug_decode_vfill.so
-lib/xine/plugins/xineplug_decode_ff.la
 lib/xine/plugins/xineplug_decode_ff.so
-lib/xine/plugins/xineplug_decode_lpcm.la
 lib/xine/plugins/xineplug_decode_lpcm.so
-lib/xine/plugins/xineplug_decode_mad.la
 lib/xine/plugins/xineplug_decode_mad.so
-lib/xine/plugins/xineplug_decode_mpeg2.la
 lib/xine/plugins/xineplug_decode_mpeg2.so
-lib/xine/plugins/xineplug_decode_spu.la
 lib/xine/plugins/xineplug_decode_spu.so
-lib/xine/plugins/xineplug_decode_spucc.la
 lib/xine/plugins/xineplug_decode_spucc.so
-lib/xine/plugins/xineplug_decode_sputext.la
 lib/xine/plugins/xineplug_decode_sputext.so
-%%HAVE_VORBIS%%lib/xine/plugins/xineplug_decode_vorbis.la
 %%HAVE_VORBIS%%lib/xine/plugins/xineplug_decode_vorbis.so
-lib/xine/plugins/xineplug_decode_w32dll.la
 lib/xine/plugins/xineplug_decode_w32dll.so
-lib/xine/plugins/xineplug_dmx_asf.la
 lib/xine/plugins/xineplug_dmx_asf.so
-lib/xine/plugins/xineplug_dmx_avi.la
 lib/xine/plugins/xineplug_dmx_avi.so
-lib/xine/plugins/xineplug_dmx_cda.la
 lib/xine/plugins/xineplug_dmx_cda.so
-lib/xine/plugins/xineplug_dmx_mpeg.la
 lib/xine/plugins/xineplug_dmx_mpeg.so
-lib/xine/plugins/xineplug_dmx_mpeg_audio.la
 lib/xine/plugins/xineplug_dmx_mpeg_audio.so
-lib/xine/plugins/xineplug_dmx_mpeg_block.la
 lib/xine/plugins/xineplug_dmx_mpeg_block.so
-lib/xine/plugins/xineplug_dmx_mpeg_elem.la
 lib/xine/plugins/xineplug_dmx_mpeg_elem.so
-lib/xine/plugins/xineplug_dmx_mpeg_pes.la
 lib/xine/plugins/xineplug_dmx_mpeg_pes.so
-lib/xine/plugins/xineplug_dmx_mpeg_ts.la
 lib/xine/plugins/xineplug_dmx_mpeg_ts.so
-%%HAVE_OGG%%lib/xine/plugins/xineplug_dmx_ogg.la
 %%HAVE_OGG%%lib/xine/plugins/xineplug_dmx_ogg.so
-lib/xine/plugins/xineplug_dmx_qt.la
 lib/xine/plugins/xineplug_dmx_qt.so
-lib/xine/plugins/xineplug_inp_dvd.la
 lib/xine/plugins/xineplug_inp_dvd.so
-lib/xine/plugins/xineplug_inp_file.la
 lib/xine/plugins/xineplug_inp_file.so
-lib/xine/plugins/xineplug_inp_http.la
 lib/xine/plugins/xineplug_inp_http.so
-lib/xine/plugins/xineplug_inp_net.la
 lib/xine/plugins/xineplug_inp_net.so
-lib/xine/plugins/xineplug_inp_rtp.la
 lib/xine/plugins/xineplug_inp_rtp.so
-lib/xine/plugins/xineplug_inp_stdin_fifo.la
 lib/xine/plugins/xineplug_inp_stdin_fifo.so
-lib/xine/plugins/xineplug_inp_vcd.la
 lib/xine/plugins/xineplug_inp_vcd.so
-lib/xine/plugins/xineplug_vo_out_aa.la
 lib/xine/plugins/xineplug_vo_out_aa.so
-lib/xine/plugins/xineplug_vo_out_syncfb.la
 lib/xine/plugins/xineplug_vo_out_syncfb.so
-lib/xine/plugins/xineplug_vo_out_xshm.la
 lib/xine/plugins/xineplug_vo_out_xshm.so
-%%HAVE_LIBXV%%lib/xine/plugins/xineplug_vo_out_xv.la
 %%HAVE_LIBXV%%lib/xine/plugins/xineplug_vo_out_xv.so
 share/doc/xine/xine-lib-API/html/annotated.html
 share/doc/xine/xine-lib-API/html/doxygen.css

>Release-Note:
>Audit-Trail:
>Unformatted:

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200201281856.g0SIueX00164>