diff options
author | MANTANI Nobutaka <nobutaka@FreeBSD.org> | 2002-01-29 13:43:33 +0000 |
---|---|---|
committer | MANTANI Nobutaka <nobutaka@FreeBSD.org> | 2002-01-29 13:43:33 +0000 |
commit | 9e49911b358d8875dbf3e79022d04c0a994a2161 (patch) | |
tree | 1b4e81c3500752d3a7a1af7d1e460efea755bd63 /multimedia | |
parent | Update to 0.55 (diff) |
Support PTHREAD_CFLAGS/PTHREAD_LIBS properly.
Fix pkg-comment format.
Avoid installing useless .la files.
PR: 34381
Submitted by: KATO Tsuguru <tkato@prontomail.com>
Notes
Notes:
svn path=/head/; revision=53964
Diffstat (limited to 'multimedia')
-rw-r--r-- | multimedia/libxine/Makefile | 31 | ||||
-rw-r--r-- | multimedia/libxine/files/patch-ltmain.sh | 23 | ||||
-rw-r--r-- | multimedia/libxine/files/patch-src:libw32dll:DirectShow:Makefile.am | 7 | ||||
-rw-r--r-- | multimedia/libxine/files/patch-src:libw32dll:wine:Makefile.am | 11 | ||||
-rw-r--r-- | multimedia/libxine/pkg-comment | 2 | ||||
-rw-r--r-- | multimedia/libxine/pkg-plist | 40 |
6 files changed, 63 insertions, 51 deletions
diff --git a/multimedia/libxine/Makefile b/multimedia/libxine/Makefile index 0bbfc74e1d4b..9c8a099b881b 100644 --- a/multimedia/libxine/Makefile +++ b/multimedia/libxine/Makefile @@ -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 @@ LIB_DEPENDS= a52.0:${PORTSDIR}/audio/liba52 \ 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="" 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 --git a/multimedia/libxine/files/patch-ltmain.sh b/multimedia/libxine/files/patch-ltmain.sh new file mode 100644 index 000000000000..f9b3022f3c06 --- /dev/null +++ b/multimedia/libxine/files/patch-ltmain.sh @@ -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 --git a/multimedia/libxine/files/patch-src:libw32dll:DirectShow:Makefile.am b/multimedia/libxine/files/patch-src:libw32dll:DirectShow:Makefile.am new file mode 100644 index 000000000000..604e19e594e6 --- /dev/null +++ b/multimedia/libxine/files/patch-src:libw32dll:DirectShow:Makefile.am @@ -0,0 +1,7 @@ +--- src/libw32dll/DirectShow/Makefile.am.orig Fri Jan 11 04:59:50 2002 ++++ src/libw32dll/DirectShow/Makefile.am Tue Jan 29 12:12:58 2002 +@@ -1,3 +1,4 @@ ++INCLUDES = @INCLUDES@ -I$(srcdir)/.. + + CFLAGS = @GLOBAL_CFLAGS@ @X_CFLAGS@ -fno-omit-frame-pointer \ + -Wmissing-prototypes -Wimplicit-function-declaration \ diff --git a/multimedia/libxine/files/patch-src:libw32dll:wine:Makefile.am b/multimedia/libxine/files/patch-src:libw32dll:wine:Makefile.am new file mode 100644 index 000000000000..52658e0cc015 --- /dev/null +++ b/multimedia/libxine/files/patch-src:libw32dll:wine:Makefile.am @@ -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 --git a/multimedia/libxine/pkg-comment b/multimedia/libxine/pkg-comment index 7c45087bb3bb..3f7138e01ae3 100644 --- a/multimedia/libxine/pkg-comment +++ b/multimedia/libxine/pkg-comment @@ -1 +1 @@ -xine UNIX video player library +Libraries for xine UNIX video player diff --git a/multimedia/libxine/pkg-plist b/multimedia/libxine/pkg-plist index e0eb4362c956..33c63bb76785 100644 --- a/multimedia/libxine/pkg-plist +++ b/multimedia/libxine/pkg-plist @@ -22,87 +22,47 @@ include/xine/xine_internal.h 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 |