From 00ec4f0faaf8219412bce193ee754b0031f04660 Mon Sep 17 00:00:00 2001 From: Michael Johnson Date: Tue, 7 Dec 2004 08:11:58 +0000 Subject: - Use new ffmpeg 0.4.9.p1 from ports and remove ffmpeg snapshot - Add a few mirrors to MASTER_SITES - Bump PORTREVISION due to new dependency on ffmpeg in ports --- multimedia/vlc-devel/Makefile | 70 +++++++-------------------------- multimedia/vlc-devel/files/ffmpeg-patch | 56 -------------------------- multimedia/vlc/Makefile | 70 +++++++-------------------------- multimedia/vlc/files/ffmpeg-patch | 56 -------------------------- 4 files changed, 28 insertions(+), 224 deletions(-) delete mode 100644 multimedia/vlc-devel/files/ffmpeg-patch delete mode 100644 multimedia/vlc/files/ffmpeg-patch (limited to 'multimedia') diff --git a/multimedia/vlc-devel/Makefile b/multimedia/vlc-devel/Makefile index 4c46a550227f..d614831e24dd 100644 --- a/multimedia/vlc-devel/Makefile +++ b/multimedia/vlc-devel/Makefile @@ -159,7 +159,7 @@ # # WITH_VLC_DEFAULT_FONT=/path/to/font # default: ${X11BASE}/lib/X11/fonts/bitstream-vera/Vera.ttf -# This option lets you change the default font for subtitles +# This option lets you change the default font for subtitles # # NOPORTDOCS=yes # Do not install Vlc's Documents @@ -167,21 +167,23 @@ PORTNAME= vlc PORTVERSION= 0.8.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= multimedia audio ipv6 net www MASTER_SITES= http://download.videolan.org/pub/videolan/vlc/${PORTVERSION}/ \ - http://download.videolan.org/pub/videolan/vlc/${PORTVERSION}/contrib/:ffmpeg \ + http://ftp.snt.utwente.nl/pub/software/videolan/vlc/${PORTVERSION}/ \ + ftp://ftp.crans.org/pub/videolan/vlc/${PORTVERSION}/ \ + ftp://videolan.cs.pu.edu.tw/Windows/VideoLAN/vlc/${PORTVERSION}/ \ ${MASTER_SITE_LOCAL:S|$|:mozilla|} MASTER_SITE_SUBDIR= ahze/:mozilla PKGNAMESUFFIX?= ${ESOUND_SUFFIX}${MOZILLA_SUFFIX}${PKGNAMESUFFIX2} DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \ - ffmpeg-${FFMPEG_SNAP}${EXTRACT_SUFX}:ffmpeg \ vlc-intf-mozilla-plugin${EXTRACT_SUFX}:mozilla MAINTAINER= ahze@FreeBSD.org COMMENT= Multimedia streaming server and player for various audio/video formats RUN_DEPEDNS= ${X11BASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera +LIB_DEPENDS= avcodec.1:${PORTSDIR}/multimedia/ffmpeg ### BROKEN -- Needs newer verision of toolame ### WITHOUT_TOOLAME= yes @@ -201,31 +203,17 @@ WANT_SDL= yes USE_XLIB= yes USE_ICONV= yes -FFMPEG_SNAP= 20041113 -FFMPEG_SRC_DIR= ${WRKDIR}/ffmpeg-${FFMPEG_SNAP} FAKEDIR= ${WRKDIR}/fake PLIST= ${WRKDIR}/plist INSTALLS_SHLIB= yes GNU_CONFIGURE= yes CONFIGURE_ENV+= PATH_GTKCONFIG="${GTK_CONFIG}" CFLAGS="${CFLAGS}" \ - CPPFLAGS="-I${WRKSRC}/include/vlc/ -I${FFMPEG_SRC_DIR}/libavcodec ${CPPFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \ + CPPFLAGS="-I${WRKSRC}/include/vlc/ -I${LOCALBASE}/ffmpeg ${CPPFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \ LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}" -FFMPEG_CONFIGURE_ARGS+= --enable-gpl --disable-ffserver \ - --enable-memalign-hack \ - --cc="${CC}" \ - --make="${GMAKE}" \ - --extra-ldflags="-L${LOCALBASE}/lib -L${X11BASE}/lib" \ - --extra-cflags="${CFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include" \ - --extra-libs"-lm" \ - --enable-pp \ - --enable-pthreads \ - --disable-opts - CONFIGURE_ARGS+= --enable-ffmpeg \ - --with-ffmpeg-tree=${FFMPEG_SRC_DIR} \ - --with-ffmpeg=${FFMPEG_SRC_DIR} \ + --with-ffmpeg=${LOCALBASE} \ --with-ffmpeg-zlib \ --disable-gnome \ --disable-gtk \ @@ -414,14 +402,12 @@ CONFIGURE_ARGS+=--enable-esd .if defined(WITH_FAAC) && !defined(WITHOUT_FAAC) CONFIGURE_ARGS+=--with-ffmpeg-faac -FFMPEG_CONFIGURE_ARGS+=--enable-faac LIB_DEPENDS+= faac.0:${PORTSDIR}/audio/faac .endif .if !defined(WITHOUT_FAAD) LIB_DEPENDS+= faad.0:${PORTSDIR}/audio/faad CONFIGURE_ARGS+=--enable-faad -FFMPEG_CONFIGURE_ARGS+=--enable-faad .else CONFIGURE_ARGS+=--disable-faad .endif @@ -457,8 +443,7 @@ CONFIGURE_ARGS+=--disable-caca .if !defined(WITHOUT_DTS) BUILD_DEPENDS+= ${LOCALBASE}/lib/libdts.a:${PORTSDIR}/multimedia/libdts -CONFIGURE_ARGS+=--enable-dts \ - --with-ffmpeg-dts +CONFIGURE_ARGS+=--enable-dts .else CONFIGURE_ARGS+=--disable-dts .endif @@ -476,9 +461,9 @@ CONFIGURE_ARGS+=--disable-ggi .if !defined(WITHOUT_LAME) LIB_DEPENDS+= mp3lame.0:${PORTSDIR}/audio/lame -CONFIGURE_ARGS+=--enable-mp3lame \ - --with-ffmpeg-mp3lame -FFMPEG_CONFIGURE_ARGS+=--enable-mp3lame +CONFIGURE_ARGS+=--enable-mp3lame +.else +CONFIGURE_ARGS+=--disable-mp3lame .endif .if !defined(WITHOUT_LIBMATROSKA) @@ -487,9 +472,7 @@ BUILD_DEPENDS+= ${LOCALBASE}/lib/libmatroska.a:${PORTSDIR}/multimedia/libmatrosk .if !defined(WITHOUT_LIBA52) LIB_DEPENDS+= a52.0:${PORTSDIR}/audio/liba52 -CONFIGURE_ARGS+=--enable-a52 \ - --with-a52-tree=${LOCALBASE} -FFMPEG_CONFIGURE_ARGS+=--enable-a52 +CONFIGURE_ARGS+=--enable-a52 .else CONFIGURE_ARGS+=--disable-a52 .endif @@ -595,7 +578,6 @@ CONFIGURE_ARGS+= --disable-toolame .if !defined(WITHOUT_VORBIS) LIB_DEPENDS+= vorbis.3:${PORTSDIR}/audio/libvorbis CONFIGURE_ARGS+=--enable-vorbis -FFMPEG_CONFIGURE_ARGS+=--enable-vorbis .else CONFIGURE_ARGS+=--disable-vorbis .endif @@ -611,7 +593,6 @@ CONFIGURE_ARGS+=--disable-xosd CONFIGURE_AGRS+=--enable-debug .else CONFIGURE_ARGS+=--enable-release -FFMPEG_CONFIGURE_ARGS+=--disable-debug .endif .if defined(WITH_OPTIMIZED_CFLAGS) @@ -651,10 +632,6 @@ post-patch: s|$$(libdir)/mozilla/components|${FAKEDIR}/mozilla|' \ ${WRKSRC}/mozilla/Makefile.in .endif -# a52 - @${REINPLACE_CMD} -e 's|include/a52.h|include/a52dec/a52.h|' \ - ${WRKSRC}/modules/audio_filter/converter/a52tofloat32.c \ - ${WRKSRC}/configure # skins2 interface @${REINPLACE_CMD} -e 's|lrint|rint|' \ ${WRKSRC}/modules/gui/skins2/controls/ctrl_list.cpp @@ -667,34 +644,15 @@ post-patch: # pthreads/cflags @${REINPLACE_CMD} -e 's/-lpthread/${PTHREAD_LIBS}/' \ -e 's/-lc_r/${PTHREAD_LIBS}/' \ - -e 's|postproc/postprocess.h|ffmpeg/postproc/postprocess.h|' \ -e 's|-mcpu=pentiumpro||' \ + -e 's|postproc/postprocess.h|ffmpeg/postproc/postprocess.h|' \ ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|cflags_tuning=|# cflags_tuning=|' \ ${WRKSRC}/vlc-config.in - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|' \ - ${FFMPEG_SRC_DIR}/configure - # cdrom/dvd support @${REINPLACE_CMD} -e 's|/dev/cdrom|${DEFAULT_CDROM_DEVICE}|; \ s|/dev/dvd|${DEFAULT_DVD_DEVICE}|' \ ${WRKSRC}/include/vlc_config.h -# ffmpeg -.if ${OSVERSION} < 502119 - @${REINPLACE_CMD} -e 's|roundf|rintf|' \ - ${FFMPEG_SRC_DIR}/libavcodec/xvidff.c -.endif - cd ${FFMPEG_SRC_DIR} && \ - ${PATCH} -p0 < ${PATCHDIR}/ffmpeg-patch \ - -pre-configure: - cd ${FFMPEG_SRC_DIR} \ - && ${SETENV} ${SCRIPTS_ENV} ${CONFIGURE_ENV} \ - ${SH} ./configure ${FFMPEG_CONFIGURE_ARGS} -.for dir in libavcodec libavformat - cd ${FFMPEG_SRC_DIR}/${dir} \ - && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} Makefile ${MAKE_ARGS} all -.endfor pre-install: ${RM} -rf ${PLIST} ${FAKEDIR} diff --git a/multimedia/vlc-devel/files/ffmpeg-patch b/multimedia/vlc-devel/files/ffmpeg-patch deleted file mode 100644 index 2a4b7280ae5e..000000000000 --- a/multimedia/vlc-devel/files/ffmpeg-patch +++ /dev/null @@ -1,56 +0,0 @@ ---- libavcodec/liba52/resample_mmx.c 2004/05/01 14:38:45 1.1 -+++ libavcodec/liba52/resample_mmx.c 2004/05/01 14:58:39 -@@ -7,10 +7,10 @@ - and it would mean (C / MMX2 / MMX / 3DNOW) versions - */ - --static uint64_t __attribute__((aligned(8))) magicF2W= 0x43c0000043c00000LL; --static uint64_t __attribute__((aligned(8))) wm1010= 0xFFFF0000FFFF0000LL; --static uint64_t __attribute__((aligned(8))) wm0101= 0x0000FFFF0000FFFFLL; --static uint64_t __attribute__((aligned(8))) wm1100= 0xFFFFFFFF00000000LL; -+static uint64_t __attribute__((used)) __attribute__((aligned(8))) magicF2W= 0x43c0000043c00000LL; -+static uint64_t __attribute__((used)) __attribute__((aligned(8))) wm1010= 0xFFFF0000FFFF0000LL; -+static uint64_t __attribute__((used)) __attribute__((aligned(8))) wm0101= 0x0000FFFF0000FFFFLL; -+static uint64_t __attribute__((used)) __attribute__((aligned(8))) wm1100= 0xFFFFFFFF00000000LL; - - static int a52_resample_MONO_to_5_MMX(float * _f, int16_t * s16){ - int32_t * f = (int32_t *) _f; - ---- Makefile.orig Fri Oct 22 04:08:47 2004 -+++ Makefile Fri Oct 22 04:12:43 2004 -@@ -81,28 +81,29 @@ - all: lib $(PROG) $(PROGTEST) $(VHOOK) $(QTFASTSTART) $(DOC) - - lib: -- $(MAKE) -C libavcodec all -- $(MAKE) -C libavformat all -+ $(MAKE) LDFLAGS="$(LDFLAGS)" -C libavcodec all -+ $(MAKE) LDFLAGS="$(LDFLAGS)" -C libavformat all -+ - - ffmpeg_g$(EXESUF): ffmpeg.o cmdutils.o .libs -- $(CC) $(LDFLAGS) -o $@ ffmpeg.o cmdutils.o $(FFLIBS) $(EXTRALIBS) -+ $(CC) $(FFLIBS) $(LDFLAGS) -o $@ ffmpeg.o cmdutils.o $(EXTRALIBS) - - ffmpeg$(EXESUF): ffmpeg_g$(EXESUF) - cp -p $< $@ - $(STRIP) $@ - - ffserver$(EXESUF): ffserver.o .libs -- $(CC) $(LDFLAGS) $(FFSLDFLAGS) -o $@ ffserver.o $(FFLIBS) $(EXTRALIBS) -+ $(CC) $(FFLIBS) $(LDFLAGS) $(FFSLDFLAGS) -o $@ ffserver.o $(EXTRALIBS) - - ffplay_g$(EXESUF): ffplay.o cmdutils.o .libs -- $(CC) $(LDFLAGS) -o $@ ffplay.o cmdutils.o $(FFLIBS) $(EXTRALIBS) $(SDL_LIBS) -+ $(CC) $(FFLIBS) $(LDFLAGS) -o $@ ffplay.o cmdutils.o $(FFLIBS) $(EXTRALIBS) $(SDL_LIBS) - - ffplay$(EXESUF): ffplay_g$(EXESUF) - cp -p $< $@ - $(STRIP) $@ - - output_example$(EXESUF): output_example.o .libs -- $(CC) $(LDFLAGS) -o $@ output_example.o $(FFLIBS) $(EXTRALIBS) -+ $(CC) $(FFLIBS) $(LDFLAGS) -o $@ output_example.o $(EXTRALIBS) - - qt-faststart$(EXESUF): qt-faststart.c - $(CC) qt-faststart.c -o qt-faststart$(EXESUF) diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile index 4c46a550227f..d614831e24dd 100644 --- a/multimedia/vlc/Makefile +++ b/multimedia/vlc/Makefile @@ -159,7 +159,7 @@ # # WITH_VLC_DEFAULT_FONT=/path/to/font # default: ${X11BASE}/lib/X11/fonts/bitstream-vera/Vera.ttf -# This option lets you change the default font for subtitles +# This option lets you change the default font for subtitles # # NOPORTDOCS=yes # Do not install Vlc's Documents @@ -167,21 +167,23 @@ PORTNAME= vlc PORTVERSION= 0.8.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= multimedia audio ipv6 net www MASTER_SITES= http://download.videolan.org/pub/videolan/vlc/${PORTVERSION}/ \ - http://download.videolan.org/pub/videolan/vlc/${PORTVERSION}/contrib/:ffmpeg \ + http://ftp.snt.utwente.nl/pub/software/videolan/vlc/${PORTVERSION}/ \ + ftp://ftp.crans.org/pub/videolan/vlc/${PORTVERSION}/ \ + ftp://videolan.cs.pu.edu.tw/Windows/VideoLAN/vlc/${PORTVERSION}/ \ ${MASTER_SITE_LOCAL:S|$|:mozilla|} MASTER_SITE_SUBDIR= ahze/:mozilla PKGNAMESUFFIX?= ${ESOUND_SUFFIX}${MOZILLA_SUFFIX}${PKGNAMESUFFIX2} DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \ - ffmpeg-${FFMPEG_SNAP}${EXTRACT_SUFX}:ffmpeg \ vlc-intf-mozilla-plugin${EXTRACT_SUFX}:mozilla MAINTAINER= ahze@FreeBSD.org COMMENT= Multimedia streaming server and player for various audio/video formats RUN_DEPEDNS= ${X11BASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera +LIB_DEPENDS= avcodec.1:${PORTSDIR}/multimedia/ffmpeg ### BROKEN -- Needs newer verision of toolame ### WITHOUT_TOOLAME= yes @@ -201,31 +203,17 @@ WANT_SDL= yes USE_XLIB= yes USE_ICONV= yes -FFMPEG_SNAP= 20041113 -FFMPEG_SRC_DIR= ${WRKDIR}/ffmpeg-${FFMPEG_SNAP} FAKEDIR= ${WRKDIR}/fake PLIST= ${WRKDIR}/plist INSTALLS_SHLIB= yes GNU_CONFIGURE= yes CONFIGURE_ENV+= PATH_GTKCONFIG="${GTK_CONFIG}" CFLAGS="${CFLAGS}" \ - CPPFLAGS="-I${WRKSRC}/include/vlc/ -I${FFMPEG_SRC_DIR}/libavcodec ${CPPFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \ + CPPFLAGS="-I${WRKSRC}/include/vlc/ -I${LOCALBASE}/ffmpeg ${CPPFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \ LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}" -FFMPEG_CONFIGURE_ARGS+= --enable-gpl --disable-ffserver \ - --enable-memalign-hack \ - --cc="${CC}" \ - --make="${GMAKE}" \ - --extra-ldflags="-L${LOCALBASE}/lib -L${X11BASE}/lib" \ - --extra-cflags="${CFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include" \ - --extra-libs"-lm" \ - --enable-pp \ - --enable-pthreads \ - --disable-opts - CONFIGURE_ARGS+= --enable-ffmpeg \ - --with-ffmpeg-tree=${FFMPEG_SRC_DIR} \ - --with-ffmpeg=${FFMPEG_SRC_DIR} \ + --with-ffmpeg=${LOCALBASE} \ --with-ffmpeg-zlib \ --disable-gnome \ --disable-gtk \ @@ -414,14 +402,12 @@ CONFIGURE_ARGS+=--enable-esd .if defined(WITH_FAAC) && !defined(WITHOUT_FAAC) CONFIGURE_ARGS+=--with-ffmpeg-faac -FFMPEG_CONFIGURE_ARGS+=--enable-faac LIB_DEPENDS+= faac.0:${PORTSDIR}/audio/faac .endif .if !defined(WITHOUT_FAAD) LIB_DEPENDS+= faad.0:${PORTSDIR}/audio/faad CONFIGURE_ARGS+=--enable-faad -FFMPEG_CONFIGURE_ARGS+=--enable-faad .else CONFIGURE_ARGS+=--disable-faad .endif @@ -457,8 +443,7 @@ CONFIGURE_ARGS+=--disable-caca .if !defined(WITHOUT_DTS) BUILD_DEPENDS+= ${LOCALBASE}/lib/libdts.a:${PORTSDIR}/multimedia/libdts -CONFIGURE_ARGS+=--enable-dts \ - --with-ffmpeg-dts +CONFIGURE_ARGS+=--enable-dts .else CONFIGURE_ARGS+=--disable-dts .endif @@ -476,9 +461,9 @@ CONFIGURE_ARGS+=--disable-ggi .if !defined(WITHOUT_LAME) LIB_DEPENDS+= mp3lame.0:${PORTSDIR}/audio/lame -CONFIGURE_ARGS+=--enable-mp3lame \ - --with-ffmpeg-mp3lame -FFMPEG_CONFIGURE_ARGS+=--enable-mp3lame +CONFIGURE_ARGS+=--enable-mp3lame +.else +CONFIGURE_ARGS+=--disable-mp3lame .endif .if !defined(WITHOUT_LIBMATROSKA) @@ -487,9 +472,7 @@ BUILD_DEPENDS+= ${LOCALBASE}/lib/libmatroska.a:${PORTSDIR}/multimedia/libmatrosk .if !defined(WITHOUT_LIBA52) LIB_DEPENDS+= a52.0:${PORTSDIR}/audio/liba52 -CONFIGURE_ARGS+=--enable-a52 \ - --with-a52-tree=${LOCALBASE} -FFMPEG_CONFIGURE_ARGS+=--enable-a52 +CONFIGURE_ARGS+=--enable-a52 .else CONFIGURE_ARGS+=--disable-a52 .endif @@ -595,7 +578,6 @@ CONFIGURE_ARGS+= --disable-toolame .if !defined(WITHOUT_VORBIS) LIB_DEPENDS+= vorbis.3:${PORTSDIR}/audio/libvorbis CONFIGURE_ARGS+=--enable-vorbis -FFMPEG_CONFIGURE_ARGS+=--enable-vorbis .else CONFIGURE_ARGS+=--disable-vorbis .endif @@ -611,7 +593,6 @@ CONFIGURE_ARGS+=--disable-xosd CONFIGURE_AGRS+=--enable-debug .else CONFIGURE_ARGS+=--enable-release -FFMPEG_CONFIGURE_ARGS+=--disable-debug .endif .if defined(WITH_OPTIMIZED_CFLAGS) @@ -651,10 +632,6 @@ post-patch: s|$$(libdir)/mozilla/components|${FAKEDIR}/mozilla|' \ ${WRKSRC}/mozilla/Makefile.in .endif -# a52 - @${REINPLACE_CMD} -e 's|include/a52.h|include/a52dec/a52.h|' \ - ${WRKSRC}/modules/audio_filter/converter/a52tofloat32.c \ - ${WRKSRC}/configure # skins2 interface @${REINPLACE_CMD} -e 's|lrint|rint|' \ ${WRKSRC}/modules/gui/skins2/controls/ctrl_list.cpp @@ -667,34 +644,15 @@ post-patch: # pthreads/cflags @${REINPLACE_CMD} -e 's/-lpthread/${PTHREAD_LIBS}/' \ -e 's/-lc_r/${PTHREAD_LIBS}/' \ - -e 's|postproc/postprocess.h|ffmpeg/postproc/postprocess.h|' \ -e 's|-mcpu=pentiumpro||' \ + -e 's|postproc/postprocess.h|ffmpeg/postproc/postprocess.h|' \ ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|cflags_tuning=|# cflags_tuning=|' \ ${WRKSRC}/vlc-config.in - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|' \ - ${FFMPEG_SRC_DIR}/configure - # cdrom/dvd support @${REINPLACE_CMD} -e 's|/dev/cdrom|${DEFAULT_CDROM_DEVICE}|; \ s|/dev/dvd|${DEFAULT_DVD_DEVICE}|' \ ${WRKSRC}/include/vlc_config.h -# ffmpeg -.if ${OSVERSION} < 502119 - @${REINPLACE_CMD} -e 's|roundf|rintf|' \ - ${FFMPEG_SRC_DIR}/libavcodec/xvidff.c -.endif - cd ${FFMPEG_SRC_DIR} && \ - ${PATCH} -p0 < ${PATCHDIR}/ffmpeg-patch \ - -pre-configure: - cd ${FFMPEG_SRC_DIR} \ - && ${SETENV} ${SCRIPTS_ENV} ${CONFIGURE_ENV} \ - ${SH} ./configure ${FFMPEG_CONFIGURE_ARGS} -.for dir in libavcodec libavformat - cd ${FFMPEG_SRC_DIR}/${dir} \ - && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} Makefile ${MAKE_ARGS} all -.endfor pre-install: ${RM} -rf ${PLIST} ${FAKEDIR} diff --git a/multimedia/vlc/files/ffmpeg-patch b/multimedia/vlc/files/ffmpeg-patch deleted file mode 100644 index 2a4b7280ae5e..000000000000 --- a/multimedia/vlc/files/ffmpeg-patch +++ /dev/null @@ -1,56 +0,0 @@ ---- libavcodec/liba52/resample_mmx.c 2004/05/01 14:38:45 1.1 -+++ libavcodec/liba52/resample_mmx.c 2004/05/01 14:58:39 -@@ -7,10 +7,10 @@ - and it would mean (C / MMX2 / MMX / 3DNOW) versions - */ - --static uint64_t __attribute__((aligned(8))) magicF2W= 0x43c0000043c00000LL; --static uint64_t __attribute__((aligned(8))) wm1010= 0xFFFF0000FFFF0000LL; --static uint64_t __attribute__((aligned(8))) wm0101= 0x0000FFFF0000FFFFLL; --static uint64_t __attribute__((aligned(8))) wm1100= 0xFFFFFFFF00000000LL; -+static uint64_t __attribute__((used)) __attribute__((aligned(8))) magicF2W= 0x43c0000043c00000LL; -+static uint64_t __attribute__((used)) __attribute__((aligned(8))) wm1010= 0xFFFF0000FFFF0000LL; -+static uint64_t __attribute__((used)) __attribute__((aligned(8))) wm0101= 0x0000FFFF0000FFFFLL; -+static uint64_t __attribute__((used)) __attribute__((aligned(8))) wm1100= 0xFFFFFFFF00000000LL; - - static int a52_resample_MONO_to_5_MMX(float * _f, int16_t * s16){ - int32_t * f = (int32_t *) _f; - ---- Makefile.orig Fri Oct 22 04:08:47 2004 -+++ Makefile Fri Oct 22 04:12:43 2004 -@@ -81,28 +81,29 @@ - all: lib $(PROG) $(PROGTEST) $(VHOOK) $(QTFASTSTART) $(DOC) - - lib: -- $(MAKE) -C libavcodec all -- $(MAKE) -C libavformat all -+ $(MAKE) LDFLAGS="$(LDFLAGS)" -C libavcodec all -+ $(MAKE) LDFLAGS="$(LDFLAGS)" -C libavformat all -+ - - ffmpeg_g$(EXESUF): ffmpeg.o cmdutils.o .libs -- $(CC) $(LDFLAGS) -o $@ ffmpeg.o cmdutils.o $(FFLIBS) $(EXTRALIBS) -+ $(CC) $(FFLIBS) $(LDFLAGS) -o $@ ffmpeg.o cmdutils.o $(EXTRALIBS) - - ffmpeg$(EXESUF): ffmpeg_g$(EXESUF) - cp -p $< $@ - $(STRIP) $@ - - ffserver$(EXESUF): ffserver.o .libs -- $(CC) $(LDFLAGS) $(FFSLDFLAGS) -o $@ ffserver.o $(FFLIBS) $(EXTRALIBS) -+ $(CC) $(FFLIBS) $(LDFLAGS) $(FFSLDFLAGS) -o $@ ffserver.o $(EXTRALIBS) - - ffplay_g$(EXESUF): ffplay.o cmdutils.o .libs -- $(CC) $(LDFLAGS) -o $@ ffplay.o cmdutils.o $(FFLIBS) $(EXTRALIBS) $(SDL_LIBS) -+ $(CC) $(FFLIBS) $(LDFLAGS) -o $@ ffplay.o cmdutils.o $(FFLIBS) $(EXTRALIBS) $(SDL_LIBS) - - ffplay$(EXESUF): ffplay_g$(EXESUF) - cp -p $< $@ - $(STRIP) $@ - - output_example$(EXESUF): output_example.o .libs -- $(CC) $(LDFLAGS) -o $@ output_example.o $(FFLIBS) $(EXTRALIBS) -+ $(CC) $(FFLIBS) $(LDFLAGS) -o $@ output_example.o $(EXTRALIBS) - - qt-faststart$(EXESUF): qt-faststart.c - $(CC) qt-faststart.c -o qt-faststart$(EXESUF) -- cgit v1.2.3