o Update to 0.4.9.p1

o SHLIB version bump: a trick to help detect the problem that ffmpeg
  will not build with the previous ffmpeg library installed

PR:		69210 [1],
		74225 [2]
Submitted by:	ahze [1],
		Frank Mayhar <frank@exit.com> [2]

6 files changed, 68 insertions, 78 deletions

diff --git a/multimedia/ffmpeg-devel/files/ffserver.sh b/multimedia/ffmpeg-devel/files/ffserver.sh
new file mode 100644
index 000000000000..0ec0f5b65cf6
--- /dev/null
+++ b/multimedia/ffmpeg-devel/files/ffserver.sh
@@ -0,0 +1,26 @@
+#!/bin/sh
+#
+# $FreeBSD: /tmp/pcvs/ports/multimedia/ffmpeg-devel/files/Attic/ffserver.sh,v 1.1 2004-12-05 18:12:41 lioux Exp $
+#
+
+# PROVIDE: ffserver
+# REQUIRE: NETWORKING
+# KEYWORD: FreeBSD shutdown
+
+#
+# Add the following lines to /etc/rc.conf to enable  ffserver:
+#
+#ffserver_enable="YES"
+#
+ffserver_enable="NO"
+
+. %%RC_SUBR%%
+
+name=ffserver
+rcvar=`set_rcvar`
+
+command=%%PREFIX%%/bin/${name}
+required_files=%%PREFIX%%/etc/ffserver.conf
+
+load_rc_config ${name}
+run_rc_command "$1"
diff --git a/multimedia/ffmpeg-devel/files/patch-Makefile b/multimedia/ffmpeg-devel/files/patch-Makefile
index dbf623acdec4..a04053123a5f 100644
--- a/multimedia/ffmpeg-devel/files/patch-Makefile
+++ b/multimedia/ffmpeg-devel/files/patch-Makefile
@@ -1,36 +1,14 @@
---- Makefile.orig	Sun Dec 28 09:52:46 2003
-+++ Makefile	Sun Dec 28 10:00:38 2003
-@@ -6,8 +6,7 @@
- 
- 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
--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 @@
- DEP_LIBS=libavcodec/$(SLIBPREF)avcodec$(SLIBSUF) libavformat/$(SLIBPREF)avformat$(SLIBSUF)
- else
- DEP_LIBS=libavcodec/$(LIBPREF)avcodec$(LIBSUF) libavformat/$(LIBPREF)avformat$(LIBSUF)
-+endif
-+
- ifeq ($(CONFIG_MP3LAME),yes)
- EXTRALIBS+=-lmp3lame
- endif
--endif
- 
- ifeq ($(CONFIG_VORBIS),yes)
- EXTRALIBS+=-logg -lvorbis -lvorbisenc
-@@ -69,8 +69,8 @@
- all: lib $(PROG) $(PROGTEST) $(VHOOK)
+--- Makefile.orig	Sat Jul 17 11:05:15 2004
++++ Makefile	Sat Jul 17 11:04:42 2004
+@@ -81,8 +81,9 @@
+ 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)
diff --git a/multimedia/ffmpeg-devel/files/patch-configure b/multimedia/ffmpeg-devel/files/patch-configure
index 08c90a8527c6..8aa0caaa7940 100644
--- a/multimedia/ffmpeg-devel/files/patch-configure
+++ b/multimedia/ffmpeg-devel/files/patch-configure
@@ -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 15:05:54 2004
++++ configure	Sun Dec  5 15:49:57 2004
+@@ -88,7 +88,7 @@
  mandir=""
  bindir=""
  cross_prefix=""
@@ -9,47 +9,21 @@
  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 @@
-   ;;
-   --make=*) make=`echo $opt | cut -d '=' -f 2`
-   ;;
--  --extra-cflags=*) CFLAGS="${opt#--extra-cflags=}"
-+  --extra-cflags=*) CFLAGS="$CFLAGS ${opt#--extra-cflags=}"
-   ;;
-   --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 $CFLAGS $LDFLAGS -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 -lm > /dev/null 2>&1  ; then
  imlib2=yes
  fi
  
diff --git a/multimedia/ffmpeg-devel/files/patch-libavcodec::Makefile b/multimedia/ffmpeg-devel/files/patch-libavcodec::Makefile
index 04fe848c9d33..4ed42ea46e9d 100644
--- a/multimedia/ffmpeg-devel/files/patch-libavcodec::Makefile
+++ b/multimedia/ffmpeg-devel/files/patch-libavcodec::Makefile
@@ -1,22 +1,22 @@
---- 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	Sat Jul 17 11:07:57 2004
++++ libavcodec/Makefile	Sat Jul 17 11:09:21 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
 -	install -s -m 755 $(SLIB) $(prefix)/lib/libavcodec-$(VERSION).so
 -	ln -sf libavcodec-$(VERSION).so $(prefix)/lib/libavcodec.so
-+	install -s -m 755 $(SLIB) $(prefix)/lib/libavcodec.so.0
-+	cd $(prefix)/lib && ln -s libavcodec.so.0 libavcodec.so
++	install -s -m 755 $(SLIB) $(prefix)/lib/libavcodec.so.1
++	cd $(prefix)/lib && ln -s libavcodec.so.1 libavcodec.so	
  	ldconfig || true
  endif
  else
diff --git a/multimedia/ffmpeg-devel/files/patch-libavcodec::bswap.h b/multimedia/ffmpeg-devel/files/patch-libavcodec::bswap.h
index 7205d7e7a87b..8bef16c36abc 100644
--- a/multimedia/ffmpeg-devel/files/patch-libavcodec::bswap.h
+++ b/multimedia/ffmpeg-devel/files/patch-libavcodec::bswap.h
@@ -1,6 +1,6 @@
---- libavcodec/bswap.h.orig	Sun Nov  3 04:51:51 2002
-+++ libavcodec/bswap.h	Sun Nov  3 04:53:30 2002
-@@ -5,6 +5,14 @@
+--- libavcodec/bswap.h.orig	Sun Dec  5 16:03:35 2004
++++ libavcodec/bswap.h	Sun Dec  5 16:06:48 2004
+@@ -10,6 +10,14 @@
  #include <byteswap.h>
  #else
  
@@ -13,9 +13,9 @@
 +#endif
 +
  #ifdef ARCH_X86
- inline static unsigned short ByteSwap16(unsigned short x)
+ static inline unsigned short ByteSwap16(unsigned short x)
  {
-@@ -13,7 +21,11 @@
+@@ -18,7 +26,11 @@
          "0" (x));
      return x;
  }
@@ -25,9 +25,9 @@
  #define bswap_16(x) ByteSwap16(x)
 +#endif
  
- inline static unsigned int ByteSwap32(unsigned int x)
+ static inline unsigned int ByteSwap32(unsigned int x)
  {
-@@ -29,7 +41,11 @@
+@@ -34,7 +46,11 @@
        "0" (x));
    return x;
  }
@@ -37,5 +37,17 @@
  #define bswap_32(x) ByteSwap32(x)
 +#endif
  
- inline static unsigned long long int ByteSwap64(unsigned long long int x)
+ static inline unsigned long long int ByteSwap64(unsigned long long int x)
  {
+@@ -45,7 +61,11 @@
+       "0"(bswap_32((unsigned long)x)),"1"(bswap_32((unsigned long)(x>>32))));
+   return __x.__ll;
+ }
++#if defined(__FreeBSD__) && __FreeBSD_version >= 510000
++#define bswap_64(x) (be64toh(x))
++#else
+ #define bswap_64(x) ByteSwap64(x)
++#endif
+ 
+ #elif defined(ARCH_SH4)
+ 
diff --git a/multimedia/ffmpeg-devel/files/patch-libavformat::Makefile b/multimedia/ffmpeg-devel/files/patch-libavformat::Makefile
index 49134edfe3b8..36a7674c28e5 100644
--- a/multimedia/ffmpeg-devel/files/patch-libavformat::Makefile
+++ b/multimedia/ffmpeg-devel/files/patch-libavformat::Makefile
@@ -6,8 +6,8 @@
  	install -d $(prefix)/lib
 -	install -s -m 755 $(SLIB) $(prefix)/lib/libavformat-$(VERSION).so
 -	ln -sf libavformat-$(VERSION).so $(prefix)/lib/libavformat.so
-+	install -s -m 755 $(SLIB) $(prefix)/lib/libavformat.so.0
-+	ln -sf libavformat.so.0 $(prefix)/lib/libavformat.so
++	install -s -m 755 $(SLIB) $(prefix)/lib/libavformat.so.1
++	ln -sf libavformat.so.1 $(prefix)/lib/libavformat.so
  	ldconfig || true
  	mkdir -p $(prefix)/include/ffmpeg
  	install -m 644 $(VPATH)/avformat.h $(prefix)/include/ffmpeg/avformat.h