diff options
| author | nobutaka <nobutaka@FreeBSD.org> | 2001-12-01 03:53:00 +0800 |
|---|---|---|
| committer | nobutaka <nobutaka@FreeBSD.org> | 2001-12-01 03:53:00 +0800 |
| commit | 53d74751dc145e2db5ca7f25e9c4534014c1e0a1 (patch) | |
| tree | aa90f876be2639ffb94a610a5c214f0ef5d59903 | |
| parent | fc06e4a76409be2601f9444fdff007a71a6e78dd (diff) | |
| download | freebsd-ports-gnome-53d74751dc145e2db5ca7f25e9c4534014c1e0a1.tar.gz freebsd-ports-gnome-53d74751dc145e2db5ca7f25e9c4534014c1e0a1.tar.zst freebsd-ports-gnome-53d74751dc145e2db5ca7f25e9c4534014c1e0a1.zip | |
Update xine and libxine to 0.9.6.
Submitted by: lioux (for updating to 0.9.3)
Reviewed by: knu
22 files changed, 202 insertions, 156 deletions
diff --git a/graphics/libxine/Makefile b/graphics/libxine/Makefile index 1305034043d4..cb0c75430077 100644 --- a/graphics/libxine/Makefile +++ b/graphics/libxine/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xine -PORTVERSION= 0.9.2 +PORTVERSION= 0.9.6 CATEGORIES= graphics MASTER_SITES= http://xine.sourceforge.net/files/ \ ${MASTER_SITE_SOURCEFORGE} @@ -21,12 +21,12 @@ LIB_DEPENDS= a52.0:${PORTSDIR}/audio/liba52 \ aa.1:${PORTSDIR}/graphics/aalib WRKSRC= ${WRKDIR}/${PORTNAME}-lib-${PORTVERSION} +CONFIGURE_ARGS= --with-w32-path=${LOCALBASE}/lib/win32 USE_AUTOMAKE= yes USE_GMAKE= yes USE_X_PREFIX= yes USE_IMLIB= yes USE_ESOUND= yes -CONFIGURE_ARGS= --with-w32-path=${LOCALBASE}/lib/win32 INSTALLS_SHLIB= yes MAN1= xine-config.1 @@ -71,6 +71,8 @@ PLIST_SUB+= HAVE_OGG="" PLIST_SUB+= HAVE_OGG="@comment " .endif +# DVD input plugin for xine-0.9.5 is not available yet. +.if 0 .if defined(WITH_CSS) # http://members.home.nl/mphm.janssen/linuxvideo/linuxvideo.html MASTER_SITES+= http://members.home.nl/mphm.janssen/files/ @@ -81,19 +83,29 @@ LIB_DEPENDS+= dvdcss.0:${PORTSDIR}/graphics/libdvdcss PLUGIN_CSS= dvd-plugin-${PLUGIN_CSS_VERSION} PLUGIN_CSS_VERSION= 0.4 .endif +.endif pre-everything:: +.if 0 .if !defined(WITH_CSS) @${ECHO_MSG} "====>" @${ECHO_MSG} "====> To enable css support, define WITH_CSS" @${ECHO_MSG} "====>" .endif +.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: +.if 0 .if defined(WITH_CSS) @${PERL} -pi.orig -e 's/(xineplug_inp_dvd_la_LDFLAGS = -avoid-version -module)/\1 -ldvdcss/' \ ${WRKSRC}/src/input/Makefile.am @${CP} -f ${WRKDIR}/${PLUGIN_CSS}/*.[ch] ${WRKSRC}/src/input .endif +.endif .include <bsd.port.post.mk> diff --git a/graphics/libxine/distinfo b/graphics/libxine/distinfo index 65238d50b364..cbea96d23a66 100644 --- a/graphics/libxine/distinfo +++ b/graphics/libxine/distinfo @@ -1,2 +1 @@ -MD5 (xine-lib-0.9.2.tar.gz) = 5806ced82d5ccd95a94020e73152473c -MD5 (dvd-plugin-0.4.tar.gz) = 3b3020690cf16ada39bcc5385cbfd338 +MD5 (xine-lib-0.9.6.tar.gz) = 24029e1afc6f12fc1dec81a733f895f3 diff --git a/graphics/libxine/files/patch-src:libffmpeg:Makefile.am b/graphics/libxine/files/patch-src:libffmpeg:Makefile.am index 587a80910811..3ad31f89d757 100644 --- a/graphics/libxine/files/patch-src:libffmpeg:Makefile.am +++ b/graphics/libxine/files/patch-src:libffmpeg:Makefile.am @@ -1,5 +1,5 @@ ---- src/libffmpeg/Makefile.am.orig Fri Oct 19 21:19:47 2001 -+++ src/libffmpeg/Makefile.am Fri Oct 19 21:23:02 2001 +--- src/libffmpeg/Makefile.am.orig Tue Nov 27 03:34:06 2001 ++++ src/libffmpeg/Makefile.am Thu Nov 29 17:26:16 2001 @@ -2,7 +2,6 @@ ## Process this file with automake to produce Makefile.in ## @@ -8,18 +8,15 @@ CFLAGS = @GLOBAL_CFLAGS@ -@@ -13,12 +12,9 @@ +@@ -13,9 +12,8 @@ lib_LTLIBRARIES = xineplug_decode_ff.la xineplug_decode_ff_la_SOURCES = xine_decoder.c -+xineplug_decode_ff_la_LIBADD = -lavcodec -+xineplug_decode_ff_la_LDFLAGS = -avoid-version -module - -xineplug_decode_ff_la_LDFLAGS = \ - $(top_builddir)/src/libffmpeg/libavcodec/libavcodec.la \ - -avoid-version -module -- --noinst_HEADERS = config.h ++xineplug_decode_ff_la_LIBADD = -lavcodec ++xineplug_decode_ff_la_LDFLAGS = -avoid-version -module debug: @list='$(SUBDIRS)'; for subdir in $$list; do \ diff --git a/graphics/libxine/files/patch-src:liblpcm:xine_decoder.c b/graphics/libxine/files/patch-src:liblpcm:xine_decoder.c new file mode 100644 index 000000000000..7099b9ce9ce8 --- /dev/null +++ b/graphics/libxine/files/patch-src:liblpcm:xine_decoder.c @@ -0,0 +1,11 @@ +--- src/liblpcm/xine_decoder.c.orig Fri Nov 30 20:46:02 2001 ++++ src/liblpcm/xine_decoder.c Fri Nov 30 20:46:23 2001 +@@ -117,7 +117,7 @@ + + stream_be = ( buf->type == BUF_AUDIO_LPCM_BE ); + if (stream_be != this->cpu_be) +- swab (audio_buffer->mem, sample_buffer, buf->size); ++ swab (sample_buffer, audio_buffer->mem, buf->size); + else + memcpy (audio_buffer->mem, sample_buffer, buf->size); + diff --git a/graphics/libxine/files/patch-src:xine-utils:Makefile.am b/graphics/libxine/files/patch-src:xine-utils:Makefile.am new file mode 100644 index 000000000000..b32ff6a3f970 --- /dev/null +++ b/graphics/libxine/files/patch-src:xine-utils:Makefile.am @@ -0,0 +1,12 @@ +--- src/xine-utils/Makefile.am.orig Thu Nov 8 02:41:14 2001 ++++ src/xine-utils/Makefile.am Thu Nov 8 02:41:46 2001 +@@ -16,8 +16,7 @@ + -lm + + libxineutils_la_LDFLAGS = \ +- -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ +- -release $(LT_RELEASE) ++ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) + + include_HEADERS = attributes.h cpu_accel.h memcpy.h utils.h monitor.h + diff --git a/graphics/libxine/pkg-plist b/graphics/libxine/pkg-plist index c57d7e0d8d4b..b47cb2196c51 100644 --- a/graphics/libxine/pkg-plist +++ b/graphics/libxine/pkg-plist @@ -1,26 +1,29 @@ bin/xine-config -include/dxr3_overlay.h include/xine/attributes.h include/xine/audio_out.h include/xine/buffer.h include/xine/configfile.h -include/xine/cpu_accel.h include/xine/demux.h +include/xine/dxr3_video_out.h +include/xine/dxr3_vo_encoder.h include/xine/events.h include/xine/input_plugin.h +include/xine/lrb.h include/xine/metronom.h -include/xine/monitor.h include/xine/resample.h include/xine/spu_decoder.h include/xine/spu_decoder_api.h -include/xine/utils.h include/xine/video_out.h include/xine/video_out_x11.h include/xine/xine_internal.h +include/xine/xineutils.h include/xine.h lib/libxine.la lib/libxine.so -lib/libxine.so.0 +lib/libxine.so.5 +lib/libxineutils.la +lib/libxineutils.so +lib/libxineutils.so.5 %%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 @@ -73,6 +76,8 @@ 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 diff --git a/graphics/xine/Makefile b/graphics/xine/Makefile index 39225f7d19d3..c61a2dae2ffb 100644 --- a/graphics/xine/Makefile +++ b/graphics/xine/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xine -PORTVERSION= 0.9.2 +PORTVERSION= 0.9.6 CATEGORIES= graphics MASTER_SITES= http://xine.sourceforge.net/files/ \ ${MASTER_SITE_SOURCEFORGE} @@ -15,20 +15,36 @@ DISTNAME= ${PORTNAME}-ui-${PORTVERSION} MAINTAINER= nobutaka@FreeBSD.org -LIB_DEPENDS= xine.0:${PORTSDIR}/graphics/libxine \ +LIB_DEPENDS= xine.5:${PORTSDIR}/graphics/libxine \ aa.1:${PORTSDIR}/graphics/aalib \ - png.5:${PORTSDIR}/graphics/png + png.5:${PORTSDIR}/graphics/png \ + intl.1:${PORTSDIR}/devel/gettext GNU_CONFIGURE= yes USE_GMAKE= yes +USE_AUTOMAKE= yes USE_X_PREFIX= yes USE_IMLIB= yes USE_LIBTOOL= yes -CONFIGURE_ARGS+= --with-w32-path=${LOCALBASE}/lib/win32 +CONFIGURE_ARGS= --with-w32-path=${LOCALBASE}/lib/win32 +CONFIGURE_ENV= CFLAGS="-I${LOCALBASE}/include" \ + CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-L${LOCALBASE}/lib" MANLANG= "" fr pl MAN1= aaxine.1 xine.1 +.include <bsd.port.pre.mk> + +.if (${ARCH} == "i386") +.if !defined(WITHOUT_WIN32_CODECS) +RUN_DEPENDS= ${CODEC_DETECTION_FILE}:${CODEC_PORT} + +CODEC_PORT= ${PORTSDIR}/graphics/win32-codecs +CODEC_DETECTION_FILE!= ${MAKE} -f ${CODEC_PORT}/Makefile -V CODEC_DETECTION_FILE +.endif +.endif + post-configure: @${LN} -sf ${LOCALBASE}/bin/libtool ${WRKSRC} @@ -36,4 +52,4 @@ post-install: @${CP} ${PREFIX}/man/man1/aaxine.1 ${PREFIX}/man/fr/man1/aaxine.1 @${CAT} ${PKGMESSAGE} -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/graphics/xine/distinfo b/graphics/xine/distinfo index d8d6b0a47d05..2d098ff1b6ee 100644 --- a/graphics/xine/distinfo +++ b/graphics/xine/distinfo @@ -1 +1 @@ -MD5 (xine-ui-0.9.2.tar.gz) = 8860c4af8b45bb2217045030d22f0dc5 +MD5 (xine-ui-0.9.6.tar.gz) = 932298823ff7d0bbadbac9d312db8a89 diff --git a/graphics/xine/files/patch-misc:desktops:Makefile.in b/graphics/xine/files/patch-misc:desktops:Makefile.in new file mode 100644 index 000000000000..a7ebea8b218f --- /dev/null +++ b/graphics/xine/files/patch-misc:desktops:Makefile.in @@ -0,0 +1,10 @@ +--- misc/desktops/Makefile.in.orig Sat Nov 24 06:09:08 2001 ++++ misc/desktops/Makefile.in Sat Nov 24 06:13:05 2001 +@@ -205,7 +205,6 @@ + + install-data-am: install-dataDATA + @$(NORMAL_INSTALL) +- $(MAKE) $(AM_MAKEFLAGS) install-data-hook + install-data: install-data-am + + install-am: all-am diff --git a/graphics/xine/files/patch-src::xitk::snapshot.c b/graphics/xine/files/patch-src::xitk::snapshot.c deleted file mode 100644 index 010b8b0ac498..000000000000 --- a/graphics/xine/files/patch-src::xitk::snapshot.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/xitk/snapshot.c.orig Fri Oct 19 16:41:20 2001 -+++ src/xitk/snapshot.c Fri Oct 19 16:41:46 2001 -@@ -48,7 +48,7 @@ - - #include <stdio.h> - #include <string.h> --#include <alloca.h> -+#include <stdlib.h> - #include <pthread.h> - - #include "xitk.h" diff --git a/graphics/xine/pkg-plist b/graphics/xine/pkg-plist index d40d9c88f080..125d497a4eac 100644 --- a/graphics/xine/pkg-plist +++ b/graphics/xine/pkg-plist @@ -21,6 +21,10 @@ share/doc/xine-ui/README_it share/doc/xine-ui/README_pl share/doc/xine-ui/bug_report_form share/idl/xine.idl +share/locale/es/LC_MESSAGES/xine-ui.mo +share/locale/es/LC_MESSAGES/xitk.mo +share/locale/fr/LC_MESSAGES/xine-ui.mo +share/locale/fr/LC_MESSAGES/xitk.mo share/xine/desktop/xine.desktop share/xine/desktop/xine.wmconfig share/xine/desktop/xine.xpm @@ -67,57 +71,17 @@ share/xine/skins/lcd/prev.png share/xine/skins/lcd/ptdn.png share/xine/skins/lcd/ptup.png share/xine/skins/lcd/setup.png +share/xine/skins/lcd/sk_itembtn.png +share/xine/skins/lcd/sk_slidv.png share/xine/skins/lcd/skinconfig share/xine/skins/lcd/skip.png share/xine/skins/lcd/slider_bg.png share/xine/skins/lcd/slider_pad.png share/xine/skins/lcd/smallbtn.png share/xine/skins/lcd/stop.png +share/xine/skins/lcd/tool.png share/xine/skins/lcd/volumebg.png share/xine/skins/lcd/volumepad.png -share/xine/skins/metal/arrowdn.png -share/xine/skins/metal/arrowdn2.png -share/xine/skins/metal/arrowup.png -share/xine/skins/metal/arrowup2.png -share/xine/skins/metal/bg.png -share/xine/skins/metal/button.png -share/xine/skins/metal/cam.png -share/xine/skins/metal/close.png -share/xine/skins/metal/eject.png -share/xine/skins/metal/exit.png -share/xine/skins/metal/fullsc.png -share/xine/skins/metal/largebtn.png -share/xine/skins/metal/left.png -share/xine/skins/metal/letters.png -share/xine/skins/metal/mrl.png -share/xine/skins/metal/mrl_play.png -share/xine/skins/metal/mute.png -share/xine/skins/metal/next.png -share/xine/skins/metal/pause.png -share/xine/skins/metal/pl_bg.png -share/xine/skins/metal/pl_btn.png -share/xine/skins/metal/pl_delete.png -share/xine/skins/metal/pl_deleteall.png -share/xine/skins/metal/pl_inputtxt.png -share/xine/skins/metal/pl_itembtn.png -share/xine/skins/metal/pl_movedown.png -share/xine/skins/metal/pl_moveup.png -share/xine/skins/metal/pl_play.png -share/xine/skins/metal/pl_slidpad.png -share/xine/skins/metal/pl_slidv.png -share/xine/skins/metal/play.png -share/xine/skins/metal/playfast.png -share/xine/skins/metal/playlist.png -share/xine/skins/metal/playslow.png -share/xine/skins/metal/prev.png -share/xine/skins/metal/right.png -share/xine/skins/metal/setup.png -share/xine/skins/metal/skinconfig -share/xine/skins/metal/slider_bg.png -share/xine/skins/metal/slider_pad.png -share/xine/skins/metal/slider_v.png -share/xine/skins/metal/smallbtn.png -share/xine/skins/metal/stop.png share/xine/skins/pitt/arrowdn.png share/xine/skins/pitt/arrowup.png share/xine/skins/pitt/bg.png @@ -154,11 +118,14 @@ share/xine/skins/pitt/prev.png share/xine/skins/pitt/ptdn.png share/xine/skins/pitt/ptup.png share/xine/skins/pitt/setup.png +share/xine/skins/pitt/sk_itembtn.png +share/xine/skins/pitt/sk_slidv.png share/xine/skins/pitt/skinconfig share/xine/skins/pitt/slider_bg.png share/xine/skins/pitt/slider_pad.png share/xine/skins/pitt/smallbtn.png share/xine/skins/pitt/stop.png +share/xine/skins/pitt/tool.png share/xine/skins/pitt/volumebg.png share/xine/skins/pitt/volumepad.png share/xine/skins/xinetic/ArrowDown.png @@ -187,6 +154,7 @@ share/xine/skins/xinetic/MainPause.png share/xine/skins/xinetic/MainPlay.png share/xine/skins/xinetic/MainPower.png share/xine/skins/xinetic/MainPrev.png +share/xine/skins/xinetic/MainSetup.png share/xine/skins/xinetic/MainStop.png share/xine/skins/xinetic/MainUp.png share/xine/skins/xinetic/MainVolumeBg.png @@ -206,6 +174,11 @@ share/xine/skins/xinetic/PlItemBtn.png share/xine/skins/xinetic/PlMoveDn.png share/xine/skins/xinetic/PlMoveUp.png share/xine/skins/xinetic/PlPlay.png +share/xine/skins/xinetic/SkArrowDown.png +share/xine/skins/xinetic/SkArrowUp.png +share/xine/skins/xinetic/SkItemBtn.png +share/xine/skins/xinetic/SkSlidBG.png +share/xine/skins/xinetic/SkSlidPad.png share/xine/skins/xinetic/SliderHBg.png share/xine/skins/xinetic/SliderHPad.png share/xine/skins/xinetic/SliderVBg.png @@ -214,7 +187,6 @@ share/xine/skins/xinetic/SmallArrowDown.png share/xine/skins/xinetic/SmallArrowUp.png share/xine/skins/xinetic/skinconfig @dirrm share/xine/skins/lcd -@dirrm share/xine/skins/metal @dirrm share/xine/skins/pitt @dirrm share/xine/skins/xinetic @dirrm share/xine/scripts diff --git a/multimedia/libxine/Makefile b/multimedia/libxine/Makefile index 1305034043d4..cb0c75430077 100644 --- a/multimedia/libxine/Makefile +++ b/multimedia/libxine/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xine -PORTVERSION= 0.9.2 +PORTVERSION= 0.9.6 CATEGORIES= graphics MASTER_SITES= http://xine.sourceforge.net/files/ \ ${MASTER_SITE_SOURCEFORGE} @@ -21,12 +21,12 @@ LIB_DEPENDS= a52.0:${PORTSDIR}/audio/liba52 \ aa.1:${PORTSDIR}/graphics/aalib WRKSRC= ${WRKDIR}/${PORTNAME}-lib-${PORTVERSION} +CONFIGURE_ARGS= --with-w32-path=${LOCALBASE}/lib/win32 USE_AUTOMAKE= yes USE_GMAKE= yes USE_X_PREFIX= yes USE_IMLIB= yes USE_ESOUND= yes -CONFIGURE_ARGS= --with-w32-path=${LOCALBASE}/lib/win32 INSTALLS_SHLIB= yes MAN1= xine-config.1 @@ -71,6 +71,8 @@ PLIST_SUB+= HAVE_OGG="" PLIST_SUB+= HAVE_OGG="@comment " .endif +# DVD input plugin for xine-0.9.5 is not available yet. +.if 0 .if defined(WITH_CSS) # http://members.home.nl/mphm.janssen/linuxvideo/linuxvideo.html MASTER_SITES+= http://members.home.nl/mphm.janssen/files/ @@ -81,19 +83,29 @@ LIB_DEPENDS+= dvdcss.0:${PORTSDIR}/graphics/libdvdcss PLUGIN_CSS= dvd-plugin-${PLUGIN_CSS_VERSION} PLUGIN_CSS_VERSION= 0.4 .endif +.endif pre-everything:: +.if 0 .if !defined(WITH_CSS) @${ECHO_MSG} "====>" @${ECHO_MSG} "====> To enable css support, define WITH_CSS" @${ECHO_MSG} "====>" .endif +.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: +.if 0 .if defined(WITH_CSS) @${PERL} -pi.orig -e 's/(xineplug_inp_dvd_la_LDFLAGS = -avoid-version -module)/\1 -ldvdcss/' \ ${WRKSRC}/src/input/Makefile.am @${CP} -f ${WRKDIR}/${PLUGIN_CSS}/*.[ch] ${WRKSRC}/src/input .endif +.endif .include <bsd.port.post.mk> diff --git a/multimedia/libxine/distinfo b/multimedia/libxine/distinfo index 65238d50b364..cbea96d23a66 100644 --- a/multimedia/libxine/distinfo +++ b/multimedia/libxine/distinfo @@ -1,2 +1 @@ -MD5 (xine-lib-0.9.2.tar.gz) = 5806ced82d5ccd95a94020e73152473c -MD5 (dvd-plugin-0.4.tar.gz) = 3b3020690cf16ada39bcc5385cbfd338 +MD5 (xine-lib-0.9.6.tar.gz) = 24029e1afc6f12fc1dec81a733f895f3 diff --git a/multimedia/libxine/files/patch-src:libffmpeg:Makefile.am b/multimedia/libxine/files/patch-src:libffmpeg:Makefile.am index 587a80910811..3ad31f89d757 100644 --- a/multimedia/libxine/files/patch-src:libffmpeg:Makefile.am +++ b/multimedia/libxine/files/patch-src:libffmpeg:Makefile.am @@ -1,5 +1,5 @@ ---- src/libffmpeg/Makefile.am.orig Fri Oct 19 21:19:47 2001 -+++ src/libffmpeg/Makefile.am Fri Oct 19 21:23:02 2001 +--- src/libffmpeg/Makefile.am.orig Tue Nov 27 03:34:06 2001 ++++ src/libffmpeg/Makefile.am Thu Nov 29 17:26:16 2001 @@ -2,7 +2,6 @@ ## Process this file with automake to produce Makefile.in ## @@ -8,18 +8,15 @@ CFLAGS = @GLOBAL_CFLAGS@ -@@ -13,12 +12,9 @@ +@@ -13,9 +12,8 @@ lib_LTLIBRARIES = xineplug_decode_ff.la xineplug_decode_ff_la_SOURCES = xine_decoder.c -+xineplug_decode_ff_la_LIBADD = -lavcodec -+xineplug_decode_ff_la_LDFLAGS = -avoid-version -module - -xineplug_decode_ff_la_LDFLAGS = \ - $(top_builddir)/src/libffmpeg/libavcodec/libavcodec.la \ - -avoid-version -module -- --noinst_HEADERS = config.h ++xineplug_decode_ff_la_LIBADD = -lavcodec ++xineplug_decode_ff_la_LDFLAGS = -avoid-version -module debug: @list='$(SUBDIRS)'; for subdir in $$list; do \ diff --git a/multimedia/libxine/files/patch-src:liblpcm:xine_decoder.c b/multimedia/libxine/files/patch-src:liblpcm:xine_decoder.c new file mode 100644 index 000000000000..7099b9ce9ce8 --- /dev/null +++ b/multimedia/libxine/files/patch-src:liblpcm:xine_decoder.c @@ -0,0 +1,11 @@ +--- src/liblpcm/xine_decoder.c.orig Fri Nov 30 20:46:02 2001 ++++ src/liblpcm/xine_decoder.c Fri Nov 30 20:46:23 2001 +@@ -117,7 +117,7 @@ + + stream_be = ( buf->type == BUF_AUDIO_LPCM_BE ); + if (stream_be != this->cpu_be) +- swab (audio_buffer->mem, sample_buffer, buf->size); ++ swab (sample_buffer, audio_buffer->mem, buf->size); + else + memcpy (audio_buffer->mem, sample_buffer, buf->size); + diff --git a/multimedia/libxine/files/patch-src:xine-utils:Makefile.am b/multimedia/libxine/files/patch-src:xine-utils:Makefile.am new file mode 100644 index 000000000000..b32ff6a3f970 --- /dev/null +++ b/multimedia/libxine/files/patch-src:xine-utils:Makefile.am @@ -0,0 +1,12 @@ +--- src/xine-utils/Makefile.am.orig Thu Nov 8 02:41:14 2001 ++++ src/xine-utils/Makefile.am Thu Nov 8 02:41:46 2001 +@@ -16,8 +16,7 @@ + -lm + + libxineutils_la_LDFLAGS = \ +- -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ +- -release $(LT_RELEASE) ++ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) + + include_HEADERS = attributes.h cpu_accel.h memcpy.h utils.h monitor.h + diff --git a/multimedia/libxine/pkg-plist b/multimedia/libxine/pkg-plist index c57d7e0d8d4b..b47cb2196c51 100644 --- a/multimedia/libxine/pkg-plist +++ b/multimedia/libxine/pkg-plist @@ -1,26 +1,29 @@ bin/xine-config -include/dxr3_overlay.h include/xine/attributes.h include/xine/audio_out.h include/xine/buffer.h include/xine/configfile.h -include/xine/cpu_accel.h include/xine/demux.h +include/xine/dxr3_video_out.h +include/xine/dxr3_vo_encoder.h include/xine/events.h include/xine/input_plugin.h +include/xine/lrb.h include/xine/metronom.h -include/xine/monitor.h include/xine/resample.h include/xine/spu_decoder.h include/xine/spu_decoder_api.h -include/xine/utils.h include/xine/video_out.h include/xine/video_out_x11.h include/xine/xine_internal.h +include/xine/xineutils.h include/xine.h lib/libxine.la lib/libxine.so -lib/libxine.so.0 +lib/libxine.so.5 +lib/libxineutils.la +lib/libxineutils.so +lib/libxineutils.so.5 %%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 @@ -73,6 +76,8 @@ 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 diff --git a/multimedia/xine/Makefile b/multimedia/xine/Makefile index 39225f7d19d3..c61a2dae2ffb 100644 --- a/multimedia/xine/Makefile +++ b/multimedia/xine/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xine -PORTVERSION= 0.9.2 +PORTVERSION= 0.9.6 CATEGORIES= graphics MASTER_SITES= http://xine.sourceforge.net/files/ \ ${MASTER_SITE_SOURCEFORGE} @@ -15,20 +15,36 @@ DISTNAME= ${PORTNAME}-ui-${PORTVERSION} MAINTAINER= nobutaka@FreeBSD.org -LIB_DEPENDS= xine.0:${PORTSDIR}/graphics/libxine \ +LIB_DEPENDS= xine.5:${PORTSDIR}/graphics/libxine \ aa.1:${PORTSDIR}/graphics/aalib \ - png.5:${PORTSDIR}/graphics/png + png.5:${PORTSDIR}/graphics/png \ + intl.1:${PORTSDIR}/devel/gettext GNU_CONFIGURE= yes USE_GMAKE= yes +USE_AUTOMAKE= yes USE_X_PREFIX= yes USE_IMLIB= yes USE_LIBTOOL= yes -CONFIGURE_ARGS+= --with-w32-path=${LOCALBASE}/lib/win32 +CONFIGURE_ARGS= --with-w32-path=${LOCALBASE}/lib/win32 +CONFIGURE_ENV= CFLAGS="-I${LOCALBASE}/include" \ + CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-L${LOCALBASE}/lib" MANLANG= "" fr pl MAN1= aaxine.1 xine.1 +.include <bsd.port.pre.mk> + +.if (${ARCH} == "i386") +.if !defined(WITHOUT_WIN32_CODECS) +RUN_DEPENDS= ${CODEC_DETECTION_FILE}:${CODEC_PORT} + +CODEC_PORT= ${PORTSDIR}/graphics/win32-codecs +CODEC_DETECTION_FILE!= ${MAKE} -f ${CODEC_PORT}/Makefile -V CODEC_DETECTION_FILE +.endif +.endif + post-configure: @${LN} -sf ${LOCALBASE}/bin/libtool ${WRKSRC} @@ -36,4 +52,4 @@ post-install: @${CP} ${PREFIX}/man/man1/aaxine.1 ${PREFIX}/man/fr/man1/aaxine.1 @${CAT} ${PKGMESSAGE} -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/multimedia/xine/distinfo b/multimedia/xine/distinfo index d8d6b0a47d05..2d098ff1b6ee 100644 --- a/multimedia/xine/distinfo +++ b/multimedia/xine/distinfo @@ -1 +1 @@ -MD5 (xine-ui-0.9.2.tar.gz) = 8860c4af8b45bb2217045030d22f0dc5 +MD5 (xine-ui-0.9.6.tar.gz) = 932298823ff7d0bbadbac9d312db8a89 diff --git a/multimedia/xine/files/patch-misc:desktops:Makefile.in b/multimedia/xine/files/patch-misc:desktops:Makefile.in new file mode 100644 index 000000000000..a7ebea8b218f --- /dev/null +++ b/multimedia/xine/files/patch-misc:desktops:Makefile.in @@ -0,0 +1,10 @@ +--- misc/desktops/Makefile.in.orig Sat Nov 24 06:09:08 2001 ++++ misc/desktops/Makefile.in Sat Nov 24 06:13:05 2001 +@@ -205,7 +205,6 @@ + + install-data-am: install-dataDATA + @$(NORMAL_INSTALL) +- $(MAKE) $(AM_MAKEFLAGS) install-data-hook + install-data: install-data-am + + install-am: all-am diff --git a/multimedia/xine/files/patch-src::xitk::snapshot.c b/multimedia/xine/files/patch-src::xitk::snapshot.c deleted file mode 100644 index 010b8b0ac498..000000000000 --- a/multimedia/xine/files/patch-src::xitk::snapshot.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/xitk/snapshot.c.orig Fri Oct 19 16:41:20 2001 -+++ src/xitk/snapshot.c Fri Oct 19 16:41:46 2001 -@@ -48,7 +48,7 @@ - - #include <stdio.h> - #include <string.h> --#include <alloca.h> -+#include <stdlib.h> - #include <pthread.h> - - #include "xitk.h" diff --git a/multimedia/xine/pkg-plist b/multimedia/xine/pkg-plist index d40d9c88f080..125d497a4eac 100644 --- a/multimedia/xine/pkg-plist +++ b/multimedia/xine/pkg-plist @@ -21,6 +21,10 @@ share/doc/xine-ui/README_it share/doc/xine-ui/README_pl share/doc/xine-ui/bug_report_form share/idl/xine.idl +share/locale/es/LC_MESSAGES/xine-ui.mo +share/locale/es/LC_MESSAGES/xitk.mo +share/locale/fr/LC_MESSAGES/xine-ui.mo +share/locale/fr/LC_MESSAGES/xitk.mo share/xine/desktop/xine.desktop share/xine/desktop/xine.wmconfig share/xine/desktop/xine.xpm @@ -67,57 +71,17 @@ share/xine/skins/lcd/prev.png share/xine/skins/lcd/ptdn.png share/xine/skins/lcd/ptup.png share/xine/skins/lcd/setup.png +share/xine/skins/lcd/sk_itembtn.png +share/xine/skins/lcd/sk_slidv.png share/xine/skins/lcd/skinconfig share/xine/skins/lcd/skip.png share/xine/skins/lcd/slider_bg.png share/xine/skins/lcd/slider_pad.png share/xine/skins/lcd/smallbtn.png share/xine/skins/lcd/stop.png +share/xine/skins/lcd/tool.png share/xine/skins/lcd/volumebg.png share/xine/skins/lcd/volumepad.png -share/xine/skins/metal/arrowdn.png -share/xine/skins/metal/arrowdn2.png -share/xine/skins/metal/arrowup.png -share/xine/skins/metal/arrowup2.png -share/xine/skins/metal/bg.png -share/xine/skins/metal/button.png -share/xine/skins/metal/cam.png -share/xine/skins/metal/close.png -share/xine/skins/metal/eject.png -share/xine/skins/metal/exit.png -share/xine/skins/metal/fullsc.png -share/xine/skins/metal/largebtn.png -share/xine/skins/metal/left.png -share/xine/skins/metal/letters.png -share/xine/skins/metal/mrl.png -share/xine/skins/metal/mrl_play.png -share/xine/skins/metal/mute.png -share/xine/skins/metal/next.png -share/xine/skins/metal/pause.png -share/xine/skins/metal/pl_bg.png -share/xine/skins/metal/pl_btn.png -share/xine/skins/metal/pl_delete.png -share/xine/skins/metal/pl_deleteall.png -share/xine/skins/metal/pl_inputtxt.png -share/xine/skins/metal/pl_itembtn.png -share/xine/skins/metal/pl_movedown.png -share/xine/skins/metal/pl_moveup.png -share/xine/skins/metal/pl_play.png -share/xine/skins/metal/pl_slidpad.png -share/xine/skins/metal/pl_slidv.png -share/xine/skins/metal/play.png -share/xine/skins/metal/playfast.png -share/xine/skins/metal/playlist.png -share/xine/skins/metal/playslow.png -share/xine/skins/metal/prev.png -share/xine/skins/metal/right.png -share/xine/skins/metal/setup.png -share/xine/skins/metal/skinconfig -share/xine/skins/metal/slider_bg.png -share/xine/skins/metal/slider_pad.png -share/xine/skins/metal/slider_v.png -share/xine/skins/metal/smallbtn.png -share/xine/skins/metal/stop.png share/xine/skins/pitt/arrowdn.png share/xine/skins/pitt/arrowup.png share/xine/skins/pitt/bg.png @@ -154,11 +118,14 @@ share/xine/skins/pitt/prev.png share/xine/skins/pitt/ptdn.png share/xine/skins/pitt/ptup.png share/xine/skins/pitt/setup.png +share/xine/skins/pitt/sk_itembtn.png +share/xine/skins/pitt/sk_slidv.png share/xine/skins/pitt/skinconfig share/xine/skins/pitt/slider_bg.png share/xine/skins/pitt/slider_pad.png share/xine/skins/pitt/smallbtn.png share/xine/skins/pitt/stop.png +share/xine/skins/pitt/tool.png share/xine/skins/pitt/volumebg.png share/xine/skins/pitt/volumepad.png share/xine/skins/xinetic/ArrowDown.png @@ -187,6 +154,7 @@ share/xine/skins/xinetic/MainPause.png share/xine/skins/xinetic/MainPlay.png share/xine/skins/xinetic/MainPower.png share/xine/skins/xinetic/MainPrev.png +share/xine/skins/xinetic/MainSetup.png share/xine/skins/xinetic/MainStop.png share/xine/skins/xinetic/MainUp.png share/xine/skins/xinetic/MainVolumeBg.png @@ -206,6 +174,11 @@ share/xine/skins/xinetic/PlItemBtn.png share/xine/skins/xinetic/PlMoveDn.png share/xine/skins/xinetic/PlMoveUp.png share/xine/skins/xinetic/PlPlay.png +share/xine/skins/xinetic/SkArrowDown.png +share/xine/skins/xinetic/SkArrowUp.png +share/xine/skins/xinetic/SkItemBtn.png +share/xine/skins/xinetic/SkSlidBG.png +share/xine/skins/xinetic/SkSlidPad.png share/xine/skins/xinetic/SliderHBg.png share/xine/skins/xinetic/SliderHPad.png share/xine/skins/xinetic/SliderVBg.png @@ -214,7 +187,6 @@ share/xine/skins/xinetic/SmallArrowDown.png share/xine/skins/xinetic/SmallArrowUp.png share/xine/skins/xinetic/skinconfig @dirrm share/xine/skins/lcd -@dirrm share/xine/skins/metal @dirrm share/xine/skins/pitt @dirrm share/xine/skins/xinetic @dirrm share/xine/scripts |