Date: Sun, 21 Nov 2004 21:16:16 -0800 (PST) From: Frank Mayhar <frank@exit.com> To: FreeBSD-gnats-submit@FreeBSD.org Cc: lioux@FreeBSD.org Subject: ports/74225: Upgrade multimedia/ffmpeg to 0.4.9-pre1. Message-ID: <200411220516.iAM5GGaR053409@realtime.exit.com> Resent-Message-ID: <200411220520.iAM5KJB6015307@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 74225
>Category: ports
>Synopsis: Upgrade multimedia/ffmpeg to 0.4.9-pre1.
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Mon Nov 22 05:20:18 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator: Frank Mayhar
>Release: FreeBSD 4.10-STABLE i386
>Organization:
Exit Consulting
>Environment:
System: FreeBSD realtime.exit.com 4.10-STABLE FreeBSD 4.10-STABLE #2: Thu Sep 16 20:46:06 PDT 2004 frank@realtime.exit.com:/usr/obj/usr/src/sys/REALTIME i386
Built and tested under 4-stable, gcc 2.95.4.
Index: ffmpeg/Makefile
===================================================================
RCS file: /cvs/repos/ports/multimedia/ffmpeg/Makefile,v
retrieving revision 1.41
diff -u -r1.41 Makefile
--- ffmpeg/Makefile 3 Sep 2004 21:48:56 -0000 1.41
+++ ffmpeg/Makefile 14 Nov 2004 20:32:05 -0000
@@ -6,11 +6,11 @@
#
PORTNAME= ffmpeg
-PORTVERSION= 0.4.8
-PORTREVISION= 5
+PORTVERSION= 0.4.9.p1
CATEGORIES= multimedia audio net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ffmpeg
+DISTNAME= ${PORTNAME:L}-${PORTVERSION:S/.p/-pre/}
MAINTAINER= lioux@FreeBSD.org
COMMENT= Hyper fast realtime audio/video encoder/converter, streaming server
@@ -25,7 +25,7 @@
--make="${GMAKE}" --enable-shared \
--extra-ldflags="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
--extra-libs"-lm" \
- --disable-debug
+ --disable-debug --enable-gpl
MAKE_ENV+= LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib"
PLIST_SUB= SHLIB_VERSION=${SHLIB_VERSION}
Index: ffmpeg/distinfo
===================================================================
RCS file: /cvs/repos/ports/multimedia/ffmpeg/distinfo,v
retrieving revision 1.7
diff -u -r1.7 distinfo
--- ffmpeg/distinfo 8 Feb 2004 01:13:53 -0000 1.7
+++ ffmpeg/distinfo 14 Nov 2004 20:10:17 -0000
@@ -1,2 +1,2 @@
-MD5 (ffmpeg-0.4.8.tar.gz) = e00d47614ba1afd99ad2ea387e782dd9
-SIZE (ffmpeg-0.4.8.tar.gz) = 1352874
+MD5 (ffmpeg-0.4.9-pre1.tar.gz) = ea5587e3c66d50b1503b82ac4179c303
+SIZE (ffmpeg-0.4.9-pre1.tar.gz) = 1611332
Index: ffmpeg/files/patch-Makefile
===================================================================
RCS file: /cvs/repos/ports/multimedia/ffmpeg/files/patch-Makefile,v
retrieving revision 1.5
diff -u -r1.5 patch-Makefile
--- ffmpeg/files/patch-Makefile 28 Dec 2003 01:05:16 -0000 1.5
+++ ffmpeg/files/patch-Makefile 14 Nov 2004 20:29:22 -0000
@@ -1,16 +1,14 @@
---- Makefile.orig Sun Dec 28 09:52:46 2003
-+++ Makefile Sun Dec 28 10:00:38 2003
-@@ -6,8 +6,7 @@
-
+--- Makefile.orig Thu Jul 8 04:02:04 2004
++++ Makefile Sun Nov 14 12:29:07 2004
+@@ -7,7 +7,6 @@
VPATH=$(SRC_PATH)
--CFLAGS= $(OPTFLAGS) -Wall -g -I. -I$(SRC_PATH) -I$(SRC_PATH)/libavcodec -I$(SRC_PATH)/libavformat -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
+ CFLAGS=$(OPTFLAGS) -I. -I$(SRC_PATH) -I$(SRC_PATH)/libavcodec -I$(SRC_PATH)/libavformat -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
-LDFLAGS+= -g
-+CFLAGS= $(OPTFLAGS) -Wall -I. -I$(SRC_PATH) -I$(SRC_PATH)/libavcodec -I$(SRC_PATH)/libavformat -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
ifeq ($(TARGET_GPROF),yes)
CFLAGS+=-p
-@@ -33,10 +32,11 @@
+@@ -37,10 +36,11 @@
DEP_LIBS=libavcodec/$(SLIBPREF)avcodec$(SLIBSUF) libavformat/$(SLIBPREF)avformat$(SLIBSUF)
else
DEP_LIBS=libavcodec/$(LIBPREF)avcodec$(LIBSUF) libavformat/$(LIBPREF)avformat$(LIBSUF)
@@ -23,8 +21,8 @@
ifeq ($(CONFIG_VORBIS),yes)
EXTRALIBS+=-logg -lvorbis -lvorbisenc
-@@ -69,8 +69,8 @@
- all: lib $(PROG) $(PROGTEST) $(VHOOK)
+@@ -81,8 +81,8 @@
+ all: lib $(PROG) $(PROGTEST) $(VHOOK) $(QTFASTSTART) $(DOC)
lib:
- $(MAKE) -C libavcodec all
Index: ffmpeg/files/patch-configure
===================================================================
RCS file: /cvs/repos/ports/multimedia/ffmpeg/files/patch-configure,v
retrieving revision 1.1
diff -u -r1.1 patch-configure
--- ffmpeg/files/patch-configure 8 Dec 2003 03:26:41 -0000 1.1
+++ ffmpeg/files/patch-configure 14 Nov 2004 20:23:34 -0000
@@ -1,6 +1,6 @@
---- configure.orig Sun Sep 28 17:26:39 2003
-+++ configure Sat Dec 6 03:41:29 2003
-@@ -22,7 +22,7 @@
+--- configure.orig Mon Jul 5 11:06:16 2004
++++ configure Sun Nov 14 12:23:08 2004
+@@ -88,7 +88,7 @@
mandir=""
bindir=""
cross_prefix=""
@@ -9,33 +9,16 @@
ar="ar"
ranlib="ranlib"
make="make"
-@@ -111,7 +111,7 @@
+@@ -187,7 +187,7 @@
BeOS)
prefix="/boot/home/config"
# helps building libavcodec
-CFLAGS="-DPIC -fomit-frame-pointer"
+CFLAGS="$CFLAGS -DPIC -fomit-frame-pointer"
# 3 gcc releases known for BeOS, each with ugly bugs
- gcc_version="$($cc -v 2>&1 | grep version | cut -d ' ' -f3-)"
+ gcc_version="`$cc -v 2>&1 | grep version | cut -d ' ' -f3-`"
case "$gcc_version" in
-@@ -177,13 +177,13 @@
- gcc_version="$($cc -v 2>&1 | grep version | cut -d ' ' -f3-)"
- case "$gcc_version" in
- *2.95*)
--CFLAGS="-no-cpp-precomp -pipe -fomit-frame-pointer"
-+CFLAGS="$CFLAGS -no-cpp-precomp -pipe -fomit-frame-pointer"
- ;;
- *3.3*)
--CFLAGS="-no-cpp-precomp -pipe -fomit-frame-pointer -mdynamic-no-pic -force_cpusubtype_ALL"
-+CFLAGS="$CFLAGS -no-cpp-precomp -pipe -fomit-frame-pointer -mdynamic-no-pic -force_cpusubtype_ALL"
- ;;
- *)
--CFLAGS="-no-cpp-precomp -pipe -fomit-frame-pointer -mdynamic-no-pic"
-+CFLAGS="$CFLAGS -no-cpp-precomp -pipe -fomit-frame-pointer -mdynamic-no-pic"
- ;;
- esac
- ;;
-@@ -276,7 +276,7 @@
+@@ -347,7 +347,7 @@
;;
--make=*) make=`echo $opt | cut -d '=' -f 2`
;;
@@ -44,11 +27,11 @@
;;
--extra-ldflags=*) LDFLAGS=${opt#--extra-ldflags=}
;;
-@@ -682,7 +682,7 @@
+@@ -857,7 +857,7 @@
EOF
imlib2=no
--if $cc -o $TMPE $TMPC -lImlib2 2> /dev/null ; then
+-if $cc -o $TMPE $TMPC -lImlib2 -lm > /dev/null 2>&1 ; then
+if $cc $CFLAGS $LDFLAGS -o $TMPE $TMPC -lImlib2 2> /dev/null ; then
imlib2=yes
fi
Index: ffmpeg/files/patch-libavcodec::Makefile
===================================================================
RCS file: /cvs/repos/ports/multimedia/ffmpeg/files/patch-libavcodec::Makefile,v
retrieving revision 1.4
diff -u -r1.4 patch-libavcodec::Makefile
--- ffmpeg/files/patch-libavcodec::Makefile 8 Dec 2003 03:26:41 -0000 1.4
+++ ffmpeg/files/patch-libavcodec::Makefile 14 Nov 2004 20:31:30 -0000
@@ -1,15 +1,15 @@
---- libavcodec/Makefile.orig Sat Dec 6 02:32:47 2003
-+++ libavcodec/Makefile Sat Dec 6 03:00:14 2003
-@@ -162,7 +162,7 @@
+--- libavcodec/Makefile.orig Fri Jun 18 06:11:15 2004
++++ libavcodec/Makefile Sun Nov 14 12:25:22 2004
+@@ -197,7 +197,7 @@
$(CC) $(SHFLAGS) -Wl,--output-def,$(@:.dll=.def) -o $@ $(OBJS) $(EXTRALIBS) $(AMREXTRALIBS)
-lib /machine:i386 /def:$(@:.dll=.def)
else
-- $(CC) $(SHFLAGS) -o $@ $(OBJS) $(EXTRALIBS) $(AMREXTRALIBS)
+- $(CC) $(SHFLAGS) -o $@ $(OBJS) $(EXTRALIBS) $(AMREXTRALIBS) $(LDFLAGS)
+ $(CC) $(SHFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(EXTRALIBS) $(AMREXTRALIBS)
endif
dsputil.o: dsputil.c dsputil.h
-@@ -230,8 +230,8 @@
+@@ -269,8 +269,8 @@
install -s -m 755 $(SLIB) "$(prefix)"
else
install -d $(prefix)/lib
>Description:
>How-To-Repeat:
>Fix:
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200411220516.iAM5GGaR053409>