[ports-multimedia commit] r74 - in trunk/ports-multimedia/multimedia/ffmpeg: . files
codesite-noreply at google.com
codesite-noreply at google.com
Thu Apr 10 08:30:33 EDT 2008
Author: buhnux
Date: Thu Apr 10 05:29:50 2008
New Revision: 74
Added:
trunk/ports-multimedia/multimedia/ffmpeg/files/patch-subdir.mk
Modified:
trunk/ports-multimedia/multimedia/ffmpeg/Makefile
trunk/ports-multimedia/multimedia/ffmpeg/distinfo
trunk/ports-multimedia/multimedia/ffmpeg/files/patch-configure
trunk/ports-multimedia/multimedia/ffmpeg/pkg-plist
Log:
Update to 2008-04-09 (this is a huge update)
Modified: trunk/ports-multimedia/multimedia/ffmpeg/Makefile
==============================================================================
--- trunk/ports-multimedia/multimedia/ffmpeg/Makefile (original)
+++ trunk/ports-multimedia/multimedia/ffmpeg/Makefile Thu Apr 10
05:29:50 2008
@@ -6,7 +6,7 @@
# $Id$
PORTNAME= ffmpeg
-DISTVERSION= 2008-02-24
+DISTVERSION= 2008-04-09
CATEGORIES= multimedia audio ipv6 net
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= ahze
@@ -29,7 +29,7 @@
--disable-debug \
--enable-memalign-hack \
--enable-shared \
- --enable-pp \
+ --enable-postproc \
--extra-cflags="${FFMPEG_CFLAGS} -I${LOCALBASE}/include" \
--extra-ldflags="-L${LOCALBASE}/lib ${FFMPEG_LDFLAGS}" \
--extra-libs="${PTHREAD_LIBS}" \
@@ -144,7 +144,7 @@
## swscaler
.if defined(WITH_SWSCALER)
-CONFIGURE_ARGS+= --enable-swscaler
+CONFIGURE_ARGS+= --enable-swscale
PLIST_SUB+= SWSCAL=""
.else
PLIST_SUB+= SWSCAL="@comment "
@@ -247,7 +247,7 @@
-e "s|(EXTRALIBS[[:space:]]*=)|\1-L${LOCALBASE}/lib |g; \
s|%%LOCALBASE%%|${LOCALBASE}|g; s|%%SHLIB_VER%%|${SHLIB_VER}|g; \
s|-pthread|${PTHREAD_LIBS}|g" \
- ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
+ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} ${WRKSRC}/subdir.mak
# force detection of texi2html
.ifndef(NOPORTDOCS)
@${REINPLACE_CMD} -E \
Modified: trunk/ports-multimedia/multimedia/ffmpeg/distinfo
==============================================================================
--- trunk/ports-multimedia/multimedia/ffmpeg/distinfo (original)
+++ trunk/ports-multimedia/multimedia/ffmpeg/distinfo Thu Apr 10
05:29:50 2008
@@ -1,3 +1,3 @@
-MD5 (ffmpeg-2008-02-24.tar.bz2) = 96f4a58effe9733655b96cf05977f110
-SHA256 (ffmpeg-2008-02-24.tar.bz2) = ed8ab66e0ccdcce7ea0ae8bfae0bef14f9a0326a84eb6e56df0eb1328b822a62
-SIZE (ffmpeg-2008-02-24.tar.bz2) = 2472686
+MD5 (ffmpeg-2008-04-09.tar.bz2) = b8562005bea797de986985e0605ba567
+SHA256 (ffmpeg-2008-04-09.tar.bz2) = 9d1892ec84b69134949c6b2f5024e2384df45fbc2febbffbd528babecb3f33f4
+SIZE (ffmpeg-2008-04-09.tar.bz2) = 2515962
Modified: trunk/ports-multimedia/multimedia/ffmpeg/files/patch-configure
==============================================================================
--- trunk/ports-multimedia/multimedia/ffmpeg/files/patch-configure (original)
+++ trunk/ports-multimedia/multimedia/ffmpeg/files/patch-configure Thu
Apr 10 05:29:50 2008
@@ -1,59 +1,6 @@
---- configure.orig 2008-02-22 12:15:24.000000000 -0500
-+++ configure 2008-02-24 20:35:29.000000000 -0500
-@@ -1083,15 +1083,9 @@
- enable fast_unaligned
- ;;
- x86_64|amd64)
-- arch="x86_32"
- enable fast_unaligned
-- canon_arch="`$cc -dumpmachine | sed -e 's,\([^-]*\)-.*,\1,'`"
-- if [ x"$canon_arch" = x"x86_64" -o x"$canon_arch" = x"amd64"
]; then
-- if [ -z "`echo $CFLAGS | grep -- -m32`" ]; then
-- arch="x86_64"
-- enable fast_64bit
-- fi
-- fi
-+ arch="x86_64"
-+ enable fast_64bit
- ;;
- # armv4l is a subset of armv[567]*l
- arm|armv[4567]*l)
-@@ -1799,10 +1793,6 @@
- optimizations="small"
- elif enabled optimizations; then
- if test -n "`$cc -v 2>&1 | grep xlc`"; then
-- add_cflags "-O5"
-- add_ldflags "-O5"
-- else
-- add_cflags "-O3"
- fi
- fi
-
-@@ -2018,17 +2008,17 @@
- if enabled shared; then
- echo "BUILD_SHARED=yes" >> config.mak
- echo "PIC=-fPIC -DPIC" >> config.mak
-- echo "SPPMAJOR=${pp_version%%.*}" >> config.mak
-+ echo "SPPMAJOR=%%SHLIB_VER%%" >> config.mak
- echo "SPPVERSION=$pp_version" >> config.mak
-- echo "LAVCMAJOR=${lavc_version%%.*}" >> config.mak
-+ echo "LAVCMAJOR=%%SHLIB_VER%%" >> config.mak
- echo "LAVCVERSION=$lavc_version" >> config.mak
-- echo "LAVDMAJOR=${lavd_version%%.*}" >> config.mak
-+ echo "LAVDMAJOR=%%SHLIB_VER%%" >> config.mak
- echo "LAVDVERSION=$lavd_version" >> config.mak
-- echo "LAVFMAJOR=${lavf_version%%.*}" >> config.mak
-+ echo "LAVFMAJOR=%%SHLIB_VER%%" >> config.mak
- echo "LAVFVERSION=$lavf_version" >> config.mak
-- echo "LAVUMAJOR=${lavu_version%%.*}" >> config.mak
-+ echo "LAVUMAJOR=%%SHLIB_VER%%" >> config.mak
- echo "LAVUVERSION=$lavu_version" >> config.mak
-- echo "SWSMAJOR=${sws_version%%.*}" >> config.mak
-+ echo "SWSMAJOR=%%SHLIB_VER%%" >> config.mak
- echo "SWSVERSION=$sws_version" >> config.mak
- echo "SLIBNAME=${SLIBNAME}" >> config.mak
- echo "SLIBNAME_WITH_VERSION=${SLIBNAME_WITH_VERSION}" >> config.mak
-@@ -2062,7 +2052,7 @@
+--- configure.orig 2008-04-07 17:16:31.000000000 -0400
++++ configure 2008-04-09 22:07:53.002061698 -0400
+@@ -2052,7 +2052,7 @@
echo "SRC_PATH=\"$source_path\"" >> config.mak
echo "SRC_PATH_BARE=$source_path" >> config.mak
@@ -62,18 +9,18 @@
# Apparently it's not possible to portably echo a backslash.
enabled asmalign_pot &&
-@@ -2142,8 +2132,8 @@
+@@ -2135,8 +2135,8 @@
Version: $version
Requires: $requires
Conflicts:
-Libs: -L\${libdir} $libs
--Cflags: -I\${includedir}/$include
-+Libs: -L\${libdir} $libs -L%%LOCALBASE%%/lib
-+Cflags: -I\${includedir}/$include I\${includedir}/$include -I%%LOCALBASE%%/include
+-Cflags: -I\${includedir}
++Libs: -L\${libdir} -L%%LOCALBASE%%/lib $libs
++Cflags: -I\${includedir} -I%%LOCALBASE%%/include -I%%LOCALBASE%%/include/ffmpeg
EOF
}
-@@ -2166,7 +2156,8 @@
+@@ -2159,7 +2159,8 @@
Requires: $requires
Conflicts:
Libs: \${libdir}/${LIBPREF}${shortname}${LIBSUF} $libs
Added: trunk/ports-multimedia/multimedia/ffmpeg/files/patch-subdir.mk
==============================================================================
--- (empty file)
+++ trunk/ports-multimedia/multimedia/ffmpeg/files/patch-subdir.mk Thu
Apr 10 05:29:50 2008
@@ -0,0 +1,23 @@
+--- subdir.mak.orig 2008-04-07 18:17:47.000000000 -0400
++++ subdir.mak 2008-04-09 22:23:32.413634214 -0400
+@@ -3,7 +3,7 @@
+ include $(SUBDIR)../common.mak
+
+ LIBVERSION := $(lib$(NAME)_VERSION)
+-LIBMAJOR := $(lib$(NAME)_VERSION_MAJOR)
++LIBMAJOR := %%SHLIB_VER%%
+
+ ifeq ($(BUILD_STATIC),yes)
+ all: $(SUBDIR)$(LIBNAME)
+@@ -55,9 +55,9 @@
+
+ install-headers::
+ install -d "$(INCINSTDIR)"
+- install -d "$(LIBDIR)/pkgconfig"
++ install -d "$(PREFIX)/libdata/pkgconfig"
+ install -m 644 $(addprefix "$(SRC_DIR)"/,$(HEADERS)) "$(INCINSTDIR)"
+- install -m 644 $(BUILD_ROOT)/lib$(NAME).pc "$(LIBDIR)/pkgconfig"
++ install -m 644 $(BUILD_ROOT)/lib$(NAME).pc "$(PREFIX)/libdata/pkgconfig"
+
+ uninstall-libs::
+ -rm -f "$(SHLIBDIR)/$(SLIBNAME_WITH_MAJOR)" \
Modified: trunk/ports-multimedia/multimedia/ffmpeg/pkg-plist
==============================================================================
--- trunk/ports-multimedia/multimedia/ffmpeg/pkg-plist (original)
+++ trunk/ports-multimedia/multimedia/ffmpeg/pkg-plist Thu Apr 10
05:29:50 2008
@@ -2,56 +2,56 @@
bin/ffserver
@unexec if cmp -s %D/etc/ffserver.conf %D/etc/ffserver.conf-dist; then
rm -f %D/etc/ffserver.conf; fi
etc/ffserver.conf-dist
-include/ffmpeg/adler32.h
-include/ffmpeg/avcodec.h
-include/ffmpeg/avdevice.h
-include/ffmpeg/avformat.h
-include/ffmpeg/avio.h
-include/ffmpeg/avstring.h
-include/ffmpeg/avutil.h
-include/ffmpeg/base64.h
-include/ffmpeg/common.h
-include/ffmpeg/crc.h
-include/ffmpeg/fifo.h
-include/ffmpeg/intfloat_readwrite.h
-include/ffmpeg/log.h
-include/ffmpeg/lzo.h
-include/ffmpeg/mathematics.h
-include/ffmpeg/md5.h
-include/ffmpeg/mem.h
-include/ffmpeg/opt.h
-include/ffmpeg/random.h
-include/ffmpeg/rational.h
-include/ffmpeg/rgb2rgb.h
-include/ffmpeg/rtsp.h
-include/ffmpeg/rtspcodes.h
-include/ffmpeg/sha1.h
-include/ffmpeg/swscale.h
-include/postproc/postprocess.h
+include/libavcodec/avcodec.h
+include/libavcodec/opt.h
+include/libavdevice/avdevice.h
+include/libavformat/avformat.h
+include/libavformat/avio.h
+include/libavformat/rtsp.h
+include/libavformat/rtspcodes.h
+include/libavutil/adler32.h
+include/libavutil/avstring.h
+include/libavutil/avutil.h
+include/libavutil/base64.h
+include/libavutil/common.h
+include/libavutil/crc.h
+include/libavutil/fifo.h
+include/libavutil/intfloat_readwrite.h
+include/libavutil/log.h
+include/libavutil/lzo.h
+include/libavutil/mathematics.h
+include/libavutil/md5.h
+include/libavutil/mem.h
+include/libavutil/random.h
+include/libavutil/rational.h
+include/libavutil/sha1.h
+include/libpostproc/postprocess.h
+%%SWSCAL%%include/libswscale/rgb2rgb.h
+%%SWSCAL%%include/libswscale/swscale.h
lib/libavcodec.a
lib/libavcodec.so
-lib/libavcodec.so.%%SHLIB_VER%%
-lib/libavcodec.so.51.50.1
+lib/libavcodec.so.1
+lib/libavcodec.so.51.54.0
lib/libavdevice.a
lib/libavdevice.so
lib/libavdevice.so.1
lib/libavdevice.so.52.0.0
lib/libavformat.a
lib/libavformat.so
-lib/libavformat.so.%%SHLIB_VER%%
-lib/libavformat.so.52.7.0
+lib/libavformat.so.1
+lib/libavformat.so.52.13.0
lib/libavutil.a
lib/libavutil.so
-lib/libavutil.so.%%SHLIB_VER%%
+lib/libavutil.so.1
lib/libavutil.so.49.6.0
lib/libpostproc.a
lib/libpostproc.so
-lib/libpostproc.so.%%SHLIB_VER%%
+lib/libpostproc.so.1
lib/libpostproc.so.51.1.0
%%SWSCAL%%lib/libswscale.a
%%SWSCAL%%lib/libswscale.so
%%SWSCAL%%lib/libswscale.so.%%SHLIB_VER%%
-%%SWSCAL%%lib/libswscale.so.0.5.0
+%%SWSCAL%%lib/libswscale.so.0.5.1
lib/vhook/fish.so
lib/vhook/null.so
lib/vhook/ppm.so
@@ -61,7 +61,11 @@
libdata/pkgconfig/libavformat.pc
libdata/pkgconfig/libavutil.pc
libdata/pkgconfig/libpostproc.pc
-libdata/pkgconfig/libswscale.pc
+%%SWSCAL%%libdata/pkgconfig/libswscale.pc
@dirrm lib/vhook
- at dirrm include/postproc
- at dirrm include/ffmpeg
+%%SWSCAL%%@dirrm include/libswscale
+ at dirrm include/libpostproc
+ at dirrm include/libavutil
+ at dirrm include/libavformat
+ at dirrm include/libavdevice
+ at dirrm include/libavcodec
More information about the multimedia-devel
mailing list