pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/multimedia remove ffmpeg010, moved to ffmpeg



details:   https://anonhg.NetBSD.org/pkgsrc/rev/0ce207b42442
branches:  trunk
changeset: 609803:0ce207b42442
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Wed Oct 10 13:35:35 2012 +0000

description:
remove ffmpeg010, moved to ffmpeg

diffstat:

 multimedia/Makefile                          |    3 +-
 multimedia/ffmpeg010/DESCR                   |    3 -
 multimedia/ffmpeg010/Makefile                |   43 ---------
 multimedia/ffmpeg010/Makefile.common         |   85 -----------------
 multimedia/ffmpeg010/PLIST                   |  129 ---------------------------
 multimedia/ffmpeg010/buildlink3.mk           |   42 --------
 multimedia/ffmpeg010/distinfo                |    9 -
 multimedia/ffmpeg010/options.mk              |  114 -----------------------
 multimedia/ffmpeg010/patches/patch-aa        |   20 ----
 multimedia/ffmpeg010/patches/patch-ac        |   13 --
 multimedia/ffmpeg010/patches/patch-ap        |   27 -----
 multimedia/ffmpeg010/patches/patch-configure |   67 --------------
 12 files changed, 1 insertions(+), 554 deletions(-)

diffs (truncated from 613 to 300 lines):

diff -r 8c2bf6f79029 -r 0ce207b42442 multimedia/Makefile
--- a/multimedia/Makefile       Wed Oct 10 13:33:44 2012 +0000
+++ b/multimedia/Makefile       Wed Oct 10 13:35:35 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.191 2012/09/14 14:53:45 drochner Exp $
+# $NetBSD: Makefile,v 1.192 2012/10/10 13:35:35 drochner Exp $
 #
 
 COMMENT=       Multimedia utilities
@@ -26,7 +26,6 @@
 SUBDIR+=       dvdview
 SUBDIR+=       farsight2
 SUBDIR+=       ffmpeg
-SUBDIR+=       ffmpeg010
 SUBDIR+=       ffmpeg2theora
 SUBDIR+=       ffmpegthumbnailer
 SUBDIR+=       ffplay
diff -r 8c2bf6f79029 -r 0ce207b42442 multimedia/ffmpeg010/DESCR
--- a/multimedia/ffmpeg010/DESCR        Wed Oct 10 13:33:44 2012 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-FFmpeg is a complete, cross-platform solution to record, convert
-and stream audio and video.  It includes libavcodec - the leading
-audio/video codec library.
diff -r 8c2bf6f79029 -r 0ce207b42442 multimedia/ffmpeg010/Makefile
--- a/multimedia/ffmpeg010/Makefile     Wed Oct 10 13:33:44 2012 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-# $NetBSD: Makefile,v 1.4 2012/10/10 10:23:44 drochner Exp $
-
-PKGNAME=       ffmpeg-20120919.${DISTVERSION}
-
-MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=      http://ffmpeg.mplayerhq.hu/
-COMMENT=       Decoding, encoding and streaming software
-
-CONFIGURE_ARGS+=       --enable-avfilter
-#CONFIGURE_ARGS+=      --enable-avfilter-lavf
-CONFIGURE_ARGS+=       --enable-postproc
-
-INSTALLATION_DIRS=     lib share/examples/ffmpeg share/doc/ffmpeg
-
-CONF_FILES+=   ${PREFIX}/share/examples/ffmpeg/ffserver.conf \
-               ${PKG_SYSCONFDIR}/ffserver.conf
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "Darwin"
-CONFIGURE_ARGS+=       --disable-asm
-.endif
-
-# "error: can't find a register in class 'GENERAL_REGS' while reloading 'asm'"
-CFLAGS.SunOS+= -DBROKEN_RELOCATIONS=1
-
-TEST_TARGET=   check
-
-post-install:
-       ${INSTALL_DATA} ${WRKSRC}/doc/*.txt \
-               ${DESTDIR}${PREFIX}/share/doc/ffmpeg
-       ${INSTALL_DATA} ${WRKSRC}/doc/ffserver.conf \
-               ${DESTDIR}${PREFIX}/share/examples/ffmpeg
-
-.include "options.mk"
-
-.include "../../mk/compiler.mk"
-
-.if !empty(PKGSRC_COMPILER:Mclang)
-CFLAGS+=       -no-integrated-as
-.endif
-
-.include "../../multimedia/ffmpeg010/Makefile.common"
diff -r 8c2bf6f79029 -r 0ce207b42442 multimedia/ffmpeg010/Makefile.common
--- a/multimedia/ffmpeg010/Makefile.common      Wed Oct 10 13:33:44 2012 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,85 +0,0 @@
-# $NetBSD: Makefile.common,v 1.2 2012/10/10 10:23:44 drochner Exp $
-# used by multimedia/ffplay/Makefile
-# used by multimedia/ffmpeg/Makefile
-
-DISTNAME=      ffmpeg-${DISTVERSION:S/-//g}
-CATEGORIES=    multimedia
-MASTER_SITES=  http://www.ffmpeg.org/releases/
-EXTRACT_SUFX=  .tar.bz2
-
-DISTVERSION=   0.10.5
-PREV_PKGPATH=  multimedia/ffmpeg-devel
-PATCHDIR=      ${.CURDIR}/../../multimedia/ffmpeg010/patches
-
-HAS_CONFIGURE= YES
-USE_LANGUAGES+=        c99
-USE_LIBTOOL=   YES
-USE_TOOLS+=    gmake texi2html pod2man
-
-.include "../../mk/compiler.mk"
-
-.if ${OPSYS} == "SunOS" && empty(CC_VERSION:Mgcc*)
-SUBST_CLASSES+=                sunwspro
-SUBST_MESSAGE.sunwspro=        Fixing compiler options for SunStudio C compiler.
-SUBST_STAGE.sunwspro=  post-configure
-SUBST_FILES.sunwspro=  config.mak
-SUBST_SED.sunwspro=    -e "s/-O /-KPIC -DPIC /"
-SUBST_SED.sunwspro+=   -e "s/-O3/-xO2/g"
-SUBST_SED.sunwspro+=   -e "s/-std=c99/-xc99=all/"
-SUBST_SED.sunwspro+=   -e "s/-Wl,-rpath-link,/-L /g"
-.endif
-
-BUILD_DEPENDS+=        yasm>=0.7.2:../../devel/yasm
-
-REPLACE_PERL+= doc/texi2pod.pl
-REPLACE_SH+=   configure version.sh
-
-SUBST_CLASSES+=                conf
-SUBST_STAGE.conf=      post-patch
-SUBST_FILES.conf=      ffserver.c
-SUBST_SED.conf=                -e 's,/etc/ffserver.conf,${PKG_SYSCONFDIR}/ffserver.conf,g'
-SUBST_MESSAGE.conf=    Fixing configuration path.
-
-PLIST_SRC+=    ${PKGDIR}/PLIST
-
-MAKE_ENV+=     EXTRA_LIBS=${LIBGETOPT:Q}
-# LOCALBASE=${LOCALBASE:Q}
-
-# Let's not put garbage into /tmp
-CONFIGURE_ENV+=                TMPDIR=${WRKSRC}/tmp
-
-CONFIGURE_ARGS+=       --mandir=${PREFIX}/${PKGMANDIR}
-CONFIGURE_ARGS+=       --cc=${CC:Q}
-CONFIGURE_ARGS+=       --prefix=${PREFIX}
-CONFIGURE_ARGS+=       --disable-debug
-CONFIGURE_ARGS+=       --disable-optimizations
-CONFIGURE_ARGS+=       --disable-stripping
-CONFIGURE_ARGS+=       --enable-shared
-CONFIGURE_ARGS+=       --enable-pthreads
-CONFIGURE_ARGS+=       --enable-gpl
-
-.if ${OPSYS} == "SunOS"
-CONFIGURE_ARGS+=       --disable-amd3dnow
-CONFIGURE_ARGS+=       --disable-amd3dnowext
-CONFIGURE_ARGS+=       --disable-mmx
-CONFIGURE_ARGS+=       --disable-mmx2
-CONFIGURE_ARGS+=       --disable-sse
-CONFIGURE_ARGS+=       --disable-ssse3
-.else
-CONFIGURE_ARGS+=       --enable-runtime-cpudetect
-.endif
-
-# No posix_memalign() in NetBSD 4.0 and earlier
-#
-.if !empty(MACHINE_PLATFORM:MNetBSD-[1-4].*-*)
-CONFIGURE_ARGS+=       --enable-memalign-hack
-.endif
-
-pre-configure:
-       mkdir ${WRKSRC}/tmp
-
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../archivers/bzip2/buildlink3.mk"
-.include "../../devel/libgetopt/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff -r 8c2bf6f79029 -r 0ce207b42442 multimedia/ffmpeg010/PLIST
--- a/multimedia/ffmpeg010/PLIST        Wed Oct 10 13:33:44 2012 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,129 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2012/09/14 14:52:34 drochner Exp $
-bin/ffmpeg
-bin/ffprobe
-bin/ffserver
-include/libavcodec/avcodec.h
-include/libavcodec/avfft.h
-include/libavcodec/dxva2.h
-include/libavcodec/opt.h
-include/libavcodec/vaapi.h
-include/libavcodec/vda.h
-include/libavcodec/vdpau.h
-include/libavcodec/version.h
-include/libavcodec/xvmc.h
-include/libavdevice/avdevice.h
-include/libavfilter/avcodec.h
-include/libavfilter/avfilter.h
-include/libavfilter/avfiltergraph.h
-include/libavfilter/buffersink.h
-include/libavfilter/version.h
-include/libavfilter/vsrc_buffer.h
-include/libavformat/avformat.h
-include/libavformat/avio.h
-include/libavformat/version.h
-include/libavutil/adler32.h
-include/libavutil/aes.h
-include/libavutil/attributes.h
-include/libavutil/audioconvert.h
-include/libavutil/avassert.h
-include/libavutil/avconfig.h
-include/libavutil/avstring.h
-include/libavutil/avutil.h
-include/libavutil/base64.h
-include/libavutil/bswap.h
-include/libavutil/common.h
-include/libavutil/cpu.h
-include/libavutil/crc.h
-include/libavutil/dict.h
-include/libavutil/error.h
-include/libavutil/eval.h
-include/libavutil/fifo.h
-include/libavutil/file.h
-include/libavutil/imgutils.h
-include/libavutil/intfloat.h
-include/libavutil/intfloat_readwrite.h
-include/libavutil/intreadwrite.h
-include/libavutil/lfg.h
-include/libavutil/log.h
-include/libavutil/lzo.h
-include/libavutil/mathematics.h
-include/libavutil/md5.h
-include/libavutil/mem.h
-include/libavutil/opt.h
-include/libavutil/parseutils.h
-include/libavutil/pixdesc.h
-include/libavutil/pixfmt.h
-include/libavutil/random_seed.h
-include/libavutil/rational.h
-include/libavutil/samplefmt.h
-include/libavutil/sha.h
-include/libpostproc/postprocess.h
-include/libswresample/swresample.h
-include/libswscale/swscale.h
-lib/libavcodec.a
-lib/libavcodec.so
-lib/libavcodec.so.53
-lib/libavcodec.so.53.61.100
-lib/libavdevice.a
-lib/libavdevice.so
-lib/libavdevice.so.53
-lib/libavdevice.so.53.4.100
-lib/libavfilter.a
-lib/libavfilter.so
-lib/libavfilter.so.2
-lib/libavfilter.so.2.61.100
-lib/libavformat.a
-lib/libavformat.so
-lib/libavformat.so.53
-lib/libavformat.so.53.32.100
-lib/libavutil.a
-lib/libavutil.so
-lib/libavutil.so.51
-lib/libavutil.so.51.35.100
-lib/libpostproc.a
-lib/libpostproc.so
-lib/libpostproc.so.52
-lib/libpostproc.so.52.0.100
-lib/libswresample.a
-lib/libswresample.so
-lib/libswresample.so.0
-lib/libswresample.so.0.6.100
-lib/libswscale.a
-lib/libswscale.so
-lib/libswscale.so.2
-lib/libswscale.so.2.1.100
-lib/pkgconfig/libavcodec.pc
-lib/pkgconfig/libavdevice.pc
-lib/pkgconfig/libavfilter.pc
-lib/pkgconfig/libavformat.pc
-lib/pkgconfig/libavutil.pc
-lib/pkgconfig/libpostproc.pc
-lib/pkgconfig/libswresample.pc
-lib/pkgconfig/libswscale.pc
-man/man1/ffmpeg.1
-man/man1/ffprobe.1
-man/man1/ffserver.1
-share/doc/ffmpeg/avutil.txt
-share/doc/ffmpeg/build_system.txt
-share/doc/ffmpeg/errno.txt
-share/doc/ffmpeg/ffmpeg.txt
-share/doc/ffmpeg/git-howto.txt
-share/doc/ffmpeg/issue_tracker.txt
-share/doc/ffmpeg/multithreading.txt
-share/doc/ffmpeg/optimization.txt
-share/doc/ffmpeg/rate_distortion.txt
-share/doc/ffmpeg/snow.txt
-share/doc/ffmpeg/soc.txt
-share/doc/ffmpeg/swresample.txt
-share/doc/ffmpeg/swscale.txt
-share/doc/ffmpeg/tablegen.txt
-share/doc/ffmpeg/viterbi.txt
-share/examples/ffmpeg/ffserver.conf
-share/ffmpeg/ffprobe.xsd
-share/ffmpeg/libvpx-1080p.ffpreset
-share/ffmpeg/libvpx-1080p50_60.ffpreset
-share/ffmpeg/libvpx-360p.ffpreset
-share/ffmpeg/libvpx-720p.ffpreset
-share/ffmpeg/libvpx-720p50_60.ffpreset
-share/ffmpeg/libx264-ipod320.ffpreset
-share/ffmpeg/libx264-ipod640.ffpreset
diff -r 8c2bf6f79029 -r 0ce207b42442 multimedia/ffmpeg010/buildlink3.mk
--- a/multimedia/ffmpeg010/buildlink3.mk        Wed Oct 10 13:33:44 2012 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.1 2012/09/14 14:52:34 drochner Exp $
-
-BUILDLINK_TREE+=       ffmpeg



Home | Main Index | Thread Index | Old Index