4 files changed, 93 insertions, 12 deletions

diff --git a/multimedia/ffmpeg-devel/files/ffserver-head.in b/multimedia/ffmpeg-devel/files/ffserver-devel.in
index 53fa2e0c6ce8..53fa2e0c6ce8 100644
--- a/multimedia/ffmpeg-devel/files/ffserver-head.in
+++ b/multimedia/ffmpeg-devel/files/ffserver-devel.in
diff --git a/multimedia/ffmpeg-devel/files/patch-configure b/multimedia/ffmpeg-devel/files/patch-configure
index e9a8840db7c0..44b605473dff 100644
--- a/multimedia/ffmpeg-devel/files/patch-configure
+++ b/multimedia/ffmpeg-devel/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	2012-01-22 14:41:15.000000000 +0100
-+++ configure	2012-01-22 16:05:39.961156595 +0100
-@@ -1806,7 +1806,7 @@
+--- configure.orig	2012-08-06 10:06:26.000000000 +0200
++++ configure	2012-08-12 09:48:55.838509614 +0200
+@@ -1924,7 +1924,7 @@
  nogas=":"
  
  # machine
@@ -9,9 +9,9 @@
  cpu="generic"
  
  # OS
-@@ -3176,10 +3176,10 @@
- texi2html -version > /dev/null 2>&1 && enable texi2html || disable texi2html
+@@ -3506,10 +3506,10 @@
  makeinfo --version > /dev/null 2>&1 && enable makeinfo  || disable makeinfo
+ pod2man --help > /dev/null 2>&1 && enable pod2man || disable pod2man
  
 -check_header linux/fb.h
 -check_header linux/videodev.h
@@ -24,7 +24,7 @@
  
  check_header sys/videoio.h
  
-@@ -3517,7 +3517,7 @@
+@@ -3897,7 +3897,7 @@
  SRC_PATH:=\$(SRC_PATH:.%=..%)
  endif
  CC_IDENT=$cc_ident
@@ -33,3 +33,63 @@
  CC=$cc
  CXX=$cxx
  AS=$as
+@@ -4093,13 +4093,13 @@
+ requires=$5
+ enabled ${name#lib} || return 0
+ mkdir -p $name
+-cat <<EOF > $name/$name.pc
++cat <<EOF > $name/${name}${build_suffix}.pc
+ prefix=$prefix
+ exec_prefix=\${prefix}
+ libdir=$libdir
+ includedir=$incdir
+ 
+-Name: $name
++Name: ${name}${build_suffix}
+ Description: $comment
+ Version: $version
+ Requires: $(enabled shared || echo $requires)
+@@ -4113,7 +4113,7 @@
+ mkdir -p doc/examples/pc-uninstalled
+ includedir=${source_path}
+ [ "$includedir" = . ] && includedir="\${pcfiledir}/../../.."
+-cat <<EOF > doc/examples/pc-uninstalled/$name.pc
++cat <<EOF > doc/examples/pc-uninstalled/${name}${build_suffix}.pc
+ prefix=
+ exec_prefix=
+ libdir=\${pcfiledir}/../../../$name
+@@ -4130,22 +4130,22 @@
+ }
+ 
+ libavfilter_pc_deps=""
+-enabled libavfilter_deps_avcodec    && prepend libavfilter_pc_deps "libavcodec = $LIBAVCODEC_VERSION,"
+-enabled libavfilter_deps_avformat   && prepend libavfilter_pc_deps "libavformat = $LIBAVFORMAT_VERSION,"
+-enabled libavfilter_deps_swscale    && prepend libavfilter_pc_deps "libswscale = $LIBSWSCALE_VERSION,"
+-enabled libavfilter_deps_swresample && prepend libavfilter_pc_deps "libswresample = $LIBSWRESAMPLE_VERSION,"
+-enabled libavfilter_deps_postproc   && prepend libavfilter_pc_deps "libpostproc = $LIBPOSTPROC_VERSION,"
++enabled libavfilter_deps_avcodec    && prepend libavfilter_pc_deps "libavcodec${build_suffix} = $LIBAVCODEC_VERSION,"
++enabled libavfilter_deps_avformat   && prepend libavfilter_pc_deps "libavformat${build_suffix} = $LIBAVFORMAT_VERSION,"
++enabled libavfilter_deps_swscale    && prepend libavfilter_pc_deps "libswscale${build_suffix} = $LIBSWSCALE_VERSION,"
++enabled libavfilter_deps_swresample && prepend libavfilter_pc_deps "libswresample${build_suffix} = $LIBSWRESAMPLE_VERSION,"
++enabled libavfilter_deps_postproc   && prepend libavfilter_pc_deps "libpostproc${build_suffix} = $LIBPOSTPROC_VERSION,"
+ libavfilter_pc_deps=${libavfilter_pc_deps%, }
+ 
+-libavdevice_pc_deps="libavformat = $LIBAVFORMAT_VERSION"
+-enabled lavfi_indev && prepend libavdevice_pc_deps "libavfilter = $LIBAVFILTER_VERSION,"
++libavdevice_pc_deps="libavformat${build_suffix} = $LIBAVFORMAT_VERSION"
++enabled lavfi_indev && prepend libavdevice_pc_deps "libavfilter${build_suffix} = $LIBAVFILTER_VERSION,"
+ 
+ pkgconfig_generate libavutil "FFmpeg utility library" "$LIBAVUTIL_VERSION" "$LIBM"
+-pkgconfig_generate libavcodec "FFmpeg codec library" "$LIBAVCODEC_VERSION" "$extralibs" "libavutil = $LIBAVUTIL_VERSION"
+-pkgconfig_generate libavformat "FFmpeg container format library" "$LIBAVFORMAT_VERSION" "$extralibs" "libavcodec = $LIBAVCODEC_VERSION"
++pkgconfig_generate libavcodec "FFmpeg codec library" "$LIBAVCODEC_VERSION" "$extralibs" "libavutil${build_suffix} = $LIBAVUTIL_VERSION"
++pkgconfig_generate libavformat "FFmpeg container format library" "$LIBAVFORMAT_VERSION" "$extralibs" "libavcodec${build_suffix} = $LIBAVCODEC_VERSION"
+ pkgconfig_generate libavdevice "FFmpeg device handling library" "$LIBAVDEVICE_VERSION" "$extralibs" "$libavdevice_pc_deps"
+ pkgconfig_generate libavfilter "FFmpeg video filtering library" "$LIBAVFILTER_VERSION" "$extralibs" "$libavfilter_pc_deps"
+-pkgconfig_generate libpostproc "FFmpeg postprocessing library" "$LIBPOSTPROC_VERSION" "" "libavutil = $LIBAVUTIL_VERSION"
++pkgconfig_generate libpostproc "FFmpeg postprocessing library" "$LIBPOSTPROC_VERSION" "" "libavutil${build_suffix} = $LIBAVUTIL_VERSION"
+ pkgconfig_generate libavresample "Libav audio resampling library" "$LIBAVRESAMPLE_VERSION" "$extralibs"
+-pkgconfig_generate libswscale "FFmpeg image rescaling library" "$LIBSWSCALE_VERSION" "$LIBM" "libavutil = $LIBAVUTIL_VERSION"
+-pkgconfig_generate libswresample "FFmpeg audio rescaling library" "$LIBSWRESAMPLE_VERSION" "$LIBM" "libavutil = $LIBAVUTIL_VERSION"
++pkgconfig_generate libswscale "FFmpeg image rescaling library" "$LIBSWSCALE_VERSION" "$LIBM" "libavutil${build_suffix} = $LIBAVUTIL_VERSION"
++pkgconfig_generate libswresample "FFmpeg audio rescaling library" "$LIBSWRESAMPLE_VERSION" "$LIBM" "libavutil${build_suffix} = $LIBAVUTIL_VERSION"
diff --git a/multimedia/ffmpeg-devel/files/patch-doc-Makefile b/multimedia/ffmpeg-devel/files/patch-doc-Makefile
new file mode 100644
index 000000000000..c3dc3fd3dad3
--- /dev/null
+++ b/multimedia/ffmpeg-devel/files/patch-doc-Makefile
@@ -0,0 +1,11 @@
+--- doc/Makefile.orig	2012-08-06 10:06:26.000000000 +0200
++++ doc/Makefile	2012-08-12 09:53:14.566506176 +0200
+@@ -54,7 +54,7 @@
+ install-man:
+ 
+ ifdef HAVE_POD2MAN
+-install-progs-$(CONFIG_DOC): install-man
++#install-progs-$(CONFIG_DOC): install-man
+ 
+ install-man: $(MANPAGES)
+ 	$(Q)mkdir -p "$(MANDIR)/man1"
diff --git a/multimedia/ffmpeg-devel/files/patch-library.mak b/multimedia/ffmpeg-devel/files/patch-library.mak
index 9c535566f90f..ec9b270751a2 100644
--- a/multimedia/ffmpeg-devel/files/patch-library.mak
+++ b/multimedia/ffmpeg-devel/files/patch-library.mak
@@ -1,14 +1,24 @@
---- library.mak.orig	2012-08-06 10:08:41.247506447 +0200
-+++ library.mak	2012-08-06 10:09:53.263505539 +0200
-@@ -76,8 +76,8 @@
+--- library.mak.orig	2012-05-25 20:02:16.000000000 +0200
++++ library.mak	2012-08-12 09:31:55.551526509 +0200
+@@ -74,9 +74,9 @@
  	$(Q)mkdir -p "$(INCINSTDIR)"
  	$$(INSTALL) -m 644 $$^ "$(INCINSTDIR)"
  
- install-lib$(NAME)-pkgconfig: $(SUBDIR)lib$(NAME).pc
+-install-lib$(NAME)-pkgconfig: $(SUBDIR)lib$(NAME).pc
 -	$(Q)mkdir -p "$(LIBDIR)/pkgconfig"
 -	$$(INSTALL) -m 644 $$^ "$(LIBDIR)/pkgconfig"
-+#	$(Q)mkdir -p "$(LIBDIR)/pkgconfig"
-+#	$$(INSTALL) -m 644 $$^ "$(LIBDIR)/pkgconfig"
++install-lib$(NAME)-pkgconfig: $(SUBDIR)lib$(NAME)$(BUILDSUF).pc
++	$(Q)mkdir -p "$(prefix)/libdata/pkgconfig"
++	$$(INSTALL) -m 644 $$^ "$(prefix)/libdata/pkgconfig"
  
  uninstall-libs::
  	-$(RM) "$(SHLIBDIR)/$(SLIBNAME_WITH_MAJOR)" \
+@@ -88,7 +88,7 @@
+ 
+ uninstall-headers::
+ 	$(RM) $(addprefix "$(INCINSTDIR)/",$(HEADERS)) $(addprefix "$(INCINSTDIR)/",$(BUILT_HEADERS))
+-	$(RM) "$(LIBDIR)/pkgconfig/lib$(NAME).pc"
++	$(RM) "$(prefix)/libdata/pkgconfig/lib$(NAME).pc"
+ 	-rmdir "$(INCINSTDIR)"
+ endef
+