3 files changed, 66 insertions, 21 deletions

diff --git a/multimedia/ffmpeg-devel/files/patch-libavcodec::Makefile b/multimedia/ffmpeg-devel/files/patch-libavcodec::Makefile
index 96f23b48f7da..e2d43cc5c7a3 100644
--- a/multimedia/ffmpeg-devel/files/patch-libavcodec::Makefile
+++ b/multimedia/ffmpeg-devel/files/patch-libavcodec::Makefile
@@ -1,13 +1,28 @@
---- libavcodec/Makefile.orig	Sun May  1 17:07:56 2005
-+++ libavcodec/Makefile	Sun May  1 17:08:29 2005
-@@ -303,8 +303,8 @@
+--- libavcodec/Makefile.orig	Sun May 22 20:58:35 2005
++++ libavcodec/Makefile	Thu May 26 13:30:41 2005
+@@ -463,8 +463,7 @@
  	install $(INSTALLSTRIP) -m 755 $(SLIB) "$(prefix)"
  else
  	install -d $(libdir)
 -	install $(INSTALLSTRIP) -m 755 $(SLIB) $(libdir)/libavcodec-$(VERSION).so
 -	ln -sf libavcodec-$(VERSION).so $(libdir)/libavcodec.so
-+	${BSD_INSTALL_DATA} $(SLIB) $(prefix)/lib/libavcodec.so.1
-+	cd $(prefix)/lib && ln -sf libavcodec.so.1 libavcodec.so
- 	ldconfig || true
++	${BSD_INSTALL_DATA} $(SLIB) $(libdir)/libavcodec.so
+ 	$(LDCONFIG) || true
  endif
  ifeq ($(CONFIG_PP),yes)
+@@ -479,12 +478,12 @@
+ 
+ install-headers:
+ 	mkdir -p "$(prefix)/include/ffmpeg"
+-	install -m 644 $(SRC_PATH)/libavcodec/avcodec.h \
++	${BSD_INSTALL_DATA} $(SRC_PATH)/libavcodec/avcodec.h \
+ 	               $(SRC_PATH)/libavcodec/common.h \
+ 	               $(SRC_PATH)/libavcodec/rational.h \
+                 "$(prefix)/include/ffmpeg"
+-	install -d $(libdir)/pkgconfig
+-	install -m 644 ../libavcodec.pc $(libdir)/pkgconfig
++	install -d $(prefix)/libdata/pkgconfig
++	${BSD_INSTALL_DATA} ../libavcodec.pc $(prefix)/libdata/pkgconfig
+ 
+ #
+ # include dependency files if they exist
diff --git a/multimedia/ffmpeg-devel/files/patch-libavcodec::libpostproc::Makefile b/multimedia/ffmpeg-devel/files/patch-libavcodec::libpostproc::Makefile
new file mode 100644
index 000000000000..67c531e3bebc
--- /dev/null
+++ b/multimedia/ffmpeg-devel/files/patch-libavcodec::libpostproc::Makefile
@@ -0,0 +1,24 @@
+--- libavcodec/libpostproc/Makefile.orig	Thu May 26 13:50:31 2005
++++ libavcodec/libpostproc/Makefile	Thu May 26 14:00:11 2005
+@@ -56,16 +56,14 @@
+ 	install $(INSTALLSTRIP) -m 755 $(SPPLIB) "$(prefix)"
+ else
+ 	install -d $(libdir)
+-	install $(INSTALLSTRIP) -m 755 $(SPPLIB) $(libdir)/$(SPPLIB).$(SPPVERSION)
+-	ln -sf $(SPPLIB).$(SPPVERSION) $(libdir)/$(SPPLIB)
+-	ln -sf $(SPPLIB).$(SPPVERSION) $(libdir)/$(SPPLIB).$(SPPMAJOR)
+-	install -d $(libdir)/pkgconfig
+-	install -m 644 ../../libpostproc.pc $(libdir)/pkgconfig
++	${BSD_INSTALL_DATA} $(SPPLIB) $(libdir)/libpostproc.so
++	install -d $(prefix)/libdata/pkgconfig
++	${BSD_INSTALL_DATA} ../../libpostproc.pc $(prefix)/libdata/pkgconfig
+ 	$(LDCONFIG) || true
+ endif
+ endif
+-	mkdir -p $(prefix)/include/postproc
+-	install -m 644 $(SRC_PATH)/libavcodec/libpostproc/postprocess.h $(prefix)/include/postproc/postprocess.h
++	mkdir -p $(prefix)/include/ffmpeg/postproc
++	${BSD_INSTALL_DATA} $(SRC_PATH)/libavcodec/libpostproc/postprocess.h $(prefix)/include/ffmpeg/postproc/postprocess.h
+ 
+ 
+ #
diff --git a/multimedia/ffmpeg-devel/files/patch-libavformat::Makefile b/multimedia/ffmpeg-devel/files/patch-libavformat::Makefile
index 5cb229d585e7..74f8e4edd0d6 100644
--- a/multimedia/ffmpeg-devel/files/patch-libavformat::Makefile
+++ b/multimedia/ffmpeg-devel/files/patch-libavformat::Makefile
@@ -1,22 +1,28 @@
---- libavformat/Makefile.orig	Tue Apr 26 07:17:51 2005
-+++ libavformat/Makefile	Sun May  1 17:15:15 2005
-@@ -37,7 +37,7 @@
- OBJS+= framehook.o 
- 
- ifeq ($(CONFIG_VIDEO4LINUX),yes)
--OBJS+= grab.o
-+OBJS+= grab_bsdbktr.o
- endif
- 
- ifeq ($(CONFIG_DV1394),yes)
-@@ -109,8 +109,8 @@
+--- libavformat/Makefile.orig	Sun May 22 20:58:36 2005
++++ libavformat/Makefile	Thu May 26 13:30:00 2005
+@@ -109,8 +109,7 @@
  	install $(INSTALLSTRIP) -m 755 $(SLIB) "$(prefix)"
  else
  	install -d $(libdir)
 -	install $(INSTALLSTRIP) -m 755 $(SLIB) $(libdir)/libavformat-$(VERSION).so
 -	ln -sf libavformat-$(VERSION).so $(libdir)/libavformat.so
-+	${BSD_INSTALL_DATA} $(SLIB) $(prefix)/lib/libavformat.so.1
-+	ln -sf libavformat.so.1 $(prefix)/lib/libavformat.so
- 	ldconfig || true
++	${BSD_INSTALL_DATA} $(SLIB) $(libdir)/libavformat.so
+ 	$(LDCONFIG) || true
  endif
  else
+@@ -122,12 +121,12 @@
+ 
+ install-headers:
+ 	mkdir -p "$(prefix)/include/ffmpeg"
+-	install -m 644 $(SRC_PATH)/libavformat/avformat.h $(SRC_PATH)/libavformat/avio.h \
++	${BSD_INSTALL_DATA} $(SRC_PATH)/libavformat/avformat.h $(SRC_PATH)/libavformat/avio.h \
+                 $(SRC_PATH)/libavformat/rtp.h $(SRC_PATH)/libavformat/rtsp.h \
+                 $(SRC_PATH)/libavformat/rtspcodes.h \
+                 "$(prefix)/include/ffmpeg"
+-	install -d $(libdir)/pkgconfig
+-	install -m 644 ../libavformat.pc $(libdir)/pkgconfig
++	install -d $(prefix)/libdata/pkgconfig
++	${BSD_INSTALL_DATA} ../libavformat.pc $(prefix)/libdata/pkgconfig
+ 
+ %.o: %.c
+ 	$(CC) $(CFLAGS) -c -o $@ $<