Attachment #132777 for bug #177145

View | Details | Raw Unified | Return to bug 177145
Collapse All | Expand All

Lines 6-12 Link Here

(-)b/multimedia/ffmpeg1/Makefile (-1 / +1 lines)
6	#	6	#
7		7
8	PORTNAME= ffmpeg	8	PORTNAME= ffmpeg
9	PORTVERSION= 1.0.5	9	PORTVERSION= 1.2
10	CATEGORIES= multimedia audio ipv6 net	10	CATEGORIES= multimedia audio ipv6 net
11	MASTER_SITES= http://ffmpeg.org/releases/	11	MASTER_SITES= http://ffmpeg.org/releases/
12	PKGNAMESUFFIX= 1	12	PKGNAMESUFFIX= 1

Lines 1-2 Link Here

(-)b/multimedia/ffmpeg1/distinfo (-2 / +2 lines)
1	SHA256 (ffmpeg-1.0.5.tar.bz2) = 1f1af23112e2da8403abce605749db9111d45d2e4e28910831e778c6e2cbdcce	1	SHA256 (ffmpeg-1.2.tar.bz2) = 9a39fbc07dae0c893059e07491bcfb1e2409cc220f72b41eed23a04becea5aaf
2	SIZE (ffmpeg-1.0.5.tar.bz2) = 6449133	2	SIZE (ffmpeg-1.2.tar.bz2) = 5969590




--- configure.orig
+++ configure
@@ -2147,7 +2147,7 @@ yasmexe_default="yasm"
 nogas=":"
 
 # machine

 cpu="generic"
 
 # OS
@@ -3991,10 +3991,10 @@ perl --version > /dev/null 2>&1 && enabl
 perl --version > /dev/null 2>&1 && enable perl || disable perl
 pod2man --help > /dev/null 2>&1 && enable pod2man || disable pod2man
 rsync --help 2> /dev/null | grep -q 'contimeout' && enable rsync_contimeout || disable rsync_contimeout
 
-check_header linux/fb.h
-check_header linux/videodev.h

 
 check_header sys/videoio.h
 
@@ -4373,7 +4373,7 @@ ifndef MAIN_MAKEFILE
 SRC_PATH:=\$(SRC_PATH:.%=..%)
 endif
 CC_IDENT=$cc_ident

 CC=$cc
 CXX=$cxx
 AS=$as
@@ -4555,7 +4555,7 @@ exec_prefix=\${prefix}
     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
 

 Description: $comment
 Version: $version
 Requires: $(enabled shared || echo $requires)
@@ -4569,10 +4569,10 @@ EOF
 mkdir -p doc/examples/pc-uninstalled
 includedir=${source_path}
 [ "$includedir" = . ] && includedir="\${pcfiledir}/../../.."

 includedir=${includedir}
 
 Name: $name
@@ -4362,25 +4362,25 @@
 }
 
 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"
 
 fix_ffmpeg_remote(){
     git_remote_from=$1

Removed Link Here

(-)a/multimedia/ffmpeg1/files/patch-libavcodec-libgsm.c (-11 lines)
1	--- libavcodec/libgsm.c.orig 2012-01-22 14:41:15.000000000 +0100
2	+++ libavcodec/libgsm.c 2012-01-22 16:06:24.357156664 +0100
3	@@ -27,7 +27,7 @@
4
5	// The idiosyncrasies of GSM-in-WAV are explained at http://kbs.cs.tu-berlin.de/~jutta/toast.html
6
7	-#include <gsm/gsm.h>
8	+#include <gsm.h>
9
10	#include "avcodec.h"
11	#include "gsm.h"




 	$(Q)mkdir -p "$(INCINSTDIR)"
 	$$(INSTALL) -m 644 $$^ "$(INCINSTDIR)"
 
 install-lib$(NAME)-pkgconfig: $(SUBDIR)lib$(FULLNAME).pc
-	$(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-headers::
 	$(RM) $(addprefix "$(INCINSTDIR)/",$(HEADERS) $(BUILT_HEADERS))
-	$(RM) "$(LIBDIR)/pkgconfig/lib$(FULLNAME).pc"
+	$(RM) "$(prefix)/libdata/pkgconfig/lib$(FULLNAME).pc"
 	-rmdir "$(INCINSTDIR)"
 endef
 




include/ffmpeg%%SUFF%%/libavutil/blowfish.h
include/ffmpeg%%SUFF%%/libavutil/bprint.h
include/ffmpeg%%SUFF%%/libavutil/bswap.h
include/ffmpeg%%SUFF%%/libavutil/channel_layout.h
include/ffmpeg%%SUFF%%/libavutil/common.h
include/ffmpeg%%SUFF%%/libavutil/cpu.h
include/ffmpeg%%SUFF%%/libavutil/crc.h

include/ffmpeg%%SUFF%%/libavutil/eval.h
include/ffmpeg%%SUFF%%/libavutil/fifo.h
include/ffmpeg%%SUFF%%/libavutil/file.h
include/ffmpeg%%SUFF%%/libavutil/hmac.h
include/ffmpeg%%SUFF%%/libavutil/imgutils.h
include/ffmpeg%%SUFF%%/libavutil/intfloat.h
include/ffmpeg%%SUFF%%/libavutil/intfloat_readwrite.h

include/ffmpeg%%SUFF%%/libavutil/mathematics.h
include/ffmpeg%%SUFF%%/libavutil/md5.h
include/ffmpeg%%SUFF%%/libavutil/mem.h
include/ffmpeg%%SUFF%%/libavutil/old_pix_fmts.h
include/ffmpeg%%SUFF%%/libavutil/opt.h
include/ffmpeg%%SUFF%%/libavutil/parseutils.h
include/ffmpeg%%SUFF%%/libavutil/pixdesc.h

include/ffmpeg%%SUFF%%/libavutil/version.h
include/ffmpeg%%SUFF%%/libavutil/xtea.h
include/ffmpeg%%SUFF%%/libpostproc/postprocess.h
include/ffmpeg%%SUFF%%/libpostproc/version.h
include/ffmpeg%%SUFF%%/libswresample/swresample.h
include/ffmpeg%%SUFF%%/libswresample/version.h
include/ffmpeg%%SUFF%%/libswscale/swscale.h
include/ffmpeg%%SUFF%%/libswscale/version.h
lib/ffmpeg%%SUFF%%/libavcodec%%SUFF%%.a
lib/ffmpeg%%SUFF%%/libavcodec%%SUFF%%.so
lib/ffmpeg%%SUFF%%/libavcodec%%SUFF%%.so.54
lib/ffmpeg%%SUFF%%/libavcodec%%SUFF%%.so.54.92.100
lib/ffmpeg%%SUFF%%/libavdevice%%SUFF%%.a
lib/ffmpeg%%SUFF%%/libavdevice%%SUFF%%.so
lib/ffmpeg%%SUFF%%/libavdevice%%SUFF%%.so.54
lib/ffmpeg%%SUFF%%/libavdevice%%SUFF%%.so.54.3.103
lib/ffmpeg%%SUFF%%/libavfilter%%SUFF%%.a
lib/ffmpeg%%SUFF%%/libavfilter%%SUFF%%.so
lib/ffmpeg%%SUFF%%/libavfilter%%SUFF%%.so.3
lib/ffmpeg%%SUFF%%/libavfilter%%SUFF%%.so.3.42.103
lib/ffmpeg%%SUFF%%/libavformat%%SUFF%%.a
lib/ffmpeg%%SUFF%%/libavformat%%SUFF%%.so
lib/ffmpeg%%SUFF%%/libavformat%%SUFF%%.so.54
lib/ffmpeg%%SUFF%%/libavformat%%SUFF%%.so.54.63.104
lib/ffmpeg%%SUFF%%/libavutil%%SUFF%%.a
lib/ffmpeg%%SUFF%%/libavutil%%SUFF%%.so
lib/ffmpeg%%SUFF%%/libavutil%%SUFF%%.so.52
lib/ffmpeg%%SUFF%%/libavutil%%SUFF%%.so.52.18.100
lib/ffmpeg%%SUFF%%/libpostproc%%SUFF%%.a
lib/ffmpeg%%SUFF%%/libpostproc%%SUFF%%.so
lib/ffmpeg%%SUFF%%/libpostproc%%SUFF%%.so.52
lib/ffmpeg%%SUFF%%/libpostproc%%SUFF%%.so.52.2.100
lib/ffmpeg%%SUFF%%/libswresample%%SUFF%%.a
lib/ffmpeg%%SUFF%%/libswresample%%SUFF%%.so
lib/ffmpeg%%SUFF%%/libswresample%%SUFF%%.so.0
lib/ffmpeg%%SUFF%%/libswresample%%SUFF%%.so.0.17.102
lib/ffmpeg%%SUFF%%/libswscale%%SUFF%%.a
lib/ffmpeg%%SUFF%%/libswscale%%SUFF%%.so
lib/ffmpeg%%SUFF%%/libswscale%%SUFF%%.so.2
lib/ffmpeg%%SUFF%%/libswscale%%SUFF%%.so.2.2.100
libdata/pkgconfig/libavcodec%%SUFF%%.pc
libdata/pkgconfig/libavdevice%%SUFF%%.pc
libdata/pkgconfig/libavfilter%%SUFF%%.pc

libdata/pkgconfig/libswresample%%SUFF%%.pc
libdata/pkgconfig/libswscale%%SUFF%%.pc
%%DATADIR%%/examples/Makefile
%%DATADIR%%/examples/README
%%DATADIR%%/examples/decoding_encoding.c
%%DATADIR%%/examples/demuxing.c
%%DATADIR%%/examples/filtering_audio.c
%%DATADIR%%/examples/filtering_video.c
%%DATADIR%%/examples/metadata.c
%%DATADIR%%/examples/muxing.c
%%DATADIR%%/examples/resampling_audio.c
%%DATADIR%%/examples/scaling_video.c
%%DATADIR%%/ffprobe.xsd
%%DATADIR%%/libvpx-1080p.ffpreset

Return to bug 177145

Lines 1-6 Link Here

(-)b/multimedia/ffmpeg1/files/patch-configure (-53 / +8 lines)
1	--- configure.orig 2013-02-07 01:29:22.000000000 +0100	1	--- configure.orig
2	+++ configure 2013-02-23 22:38:06.946960545 +0100	2	+++ configure
3	@@ -2030,7 +2030,7 @@	3	@@ -2147,7 +2147,7 @@ yasmexe_default="yasm"
4	nogas=":"	4	nogas=":"
5		5
6	# machine	6	# machine
Lines 9-17 Link Here
9	cpu="generic"	9	cpu="generic"
10		10
11	# OS	11	# OS
12	@@ -3729,10 +3729,10 @@	12	@@ -3991,10 +3991,10 @@ perl --version > /dev/null 2>&1 && enabl
13	perl --version > /dev/null 2>&1 && enable perl \|\| disable perl
14	pod2man --help > /dev/null 2>&1 && enable pod2man \|\| disable pod2man	13	pod2man --help > /dev/null 2>&1 && enable pod2man \|\| disable pod2man
		14	rsync --help 2> /dev/null \| grep -q 'contimeout' && enable rsync_contimeout \|\| disable rsync_contimeout
15		15
16	-check_header linux/fb.h	16	-check_header linux/fb.h
17	-check_header linux/videodev.h	17	-check_header linux/videodev.h
Lines 24-30 Link Here
24		24
25	check_header sys/videoio.h	25	check_header sys/videoio.h
26		26
27	@@ -4122,7 +4122,7 @@	27	@@ -4373,7 +4373,7 @@ ifndef MAIN_MAKEFILE
28	SRC_PATH:=\$(SRC_PATH:.%=..%)	28	SRC_PATH:=\$(SRC_PATH:.%=..%)
29	endif	29	endif
30	CC_IDENT=$cc_ident	30	CC_IDENT=$cc_ident
Lines 33-46 Link Here
33	CC=$cc	33	CC=$cc
34	CXX=$cxx	34	CXX=$cxx
35	AS=$as	35	AS=$as
36	@@ -4325,13 +4325,13 @@	36	@@ -4555,7 +4555,7 @@ exec_prefix=\${prefix}
37	requires=$5
38	enabled ${name#lib} \|\| return 0
39	mkdir -p $name
40	- cat <<EOF > $name/$name.pc
41	+ cat <<EOF > $name/${name}${build_suffix}.pc
42	prefix=$prefix
43	exec_prefix=\${prefix}
44	libdir=$libdir	37	libdir=$libdir
45	includedir=$incdir	38	includedir=$incdir
46		39
Lines 49-55 Link Here
49	Description: $comment	42	Description: $comment
50	Version: $version	43	Version: $version
51	Requires: $(enabled shared \|\| echo $requires)	44	Requires: $(enabled shared \|\| echo $requires)
52	@@ -4345,10 +4345,10 @@	45	@@ -4569,10 +4569,10 @@ EOF
53	mkdir -p doc/examples/pc-uninstalled	46	mkdir -p doc/examples/pc-uninstalled
54	includedir=${source_path}	47	includedir=${source_path}
55	[ "$includedir" = . ] && includedir="\${pcfiledir}/../../.."	48	[ "$includedir" = . ] && includedir="\${pcfiledir}/../../.."
Lines 62-102 Link Here
62	includedir=${includedir}	55	includedir=${includedir}
63		56
64	Name: $name	57	Name: $name
65	@@ -4362,25 +4362,25 @@
66	}
67
68	libavfilter_pc_deps=""
69	-enabled libavfilter_deps_avcodec && prepend libavfilter_pc_deps "libavcodec = $LIBAVCODEC_VERSION,"
70	-enabled libavfilter_deps_avformat && prepend libavfilter_pc_deps "libavformat = $LIBAVFORMAT_VERSION,"
71	-enabled libavfilter_deps_swscale && prepend libavfilter_pc_deps "libswscale = $LIBSWSCALE_VERSION,"
72	-enabled libavfilter_deps_swresample && prepend libavfilter_pc_deps "libswresample = $LIBSWRESAMPLE_VERSION,"
73	-enabled libavfilter_deps_postproc && prepend libavfilter_pc_deps "libpostproc = $LIBPOSTPROC_VERSION,"
74	+enabled libavfilter_deps_avcodec && prepend libavfilter_pc_deps "libavcodec${build_suffix} = $LIBAVCODEC_VERSION,"
75	+enabled libavfilter_deps_avformat && prepend libavfilter_pc_deps "libavformat${build_suffix} = $LIBAVFORMAT_VERSION,"
76	+enabled libavfilter_deps_swscale && prepend libavfilter_pc_deps "libswscale${build_suffix} = $LIBSWSCALE_VERSION,"
77	+enabled libavfilter_deps_swresample && prepend libavfilter_pc_deps "libswresample${build_suffix} = $LIBSWRESAMPLE_VERSION,"
78	+enabled libavfilter_deps_postproc && prepend libavfilter_pc_deps "libpostproc${build_suffix} = $LIBPOSTPROC_VERSION,"
79	libavfilter_pc_deps=${libavfilter_pc_deps%, }
80
81	-libavdevice_pc_deps="libavformat = $LIBAVFORMAT_VERSION"
82	-enabled lavfi_indev && prepend libavdevice_pc_deps "libavfilter = $LIBAVFILTER_VERSION,"
83	+libavdevice_pc_deps="libavformat${build_suffix} = $LIBAVFORMAT_VERSION"
84	+enabled lavfi_indev && prepend libavdevice_pc_deps "libavfilter${build_suffix} = $LIBAVFILTER_VERSION,"
85
86	pkgconfig_generate libavutil "FFmpeg utility library" "$LIBAVUTIL_VERSION" "$LIBM"
87	-pkgconfig_generate libavcodec "FFmpeg codec library" "$LIBAVCODEC_VERSION" "$extralibs" "libavutil = $LIBAVUTIL_VERSION"
88	-pkgconfig_generate libavformat "FFmpeg container format library" "$LIBAVFORMAT_VERSION" "$extralibs" "libavcodec = $LIBAVCODEC_VERSION"
89	+pkgconfig_generate libavcodec "FFmpeg codec library" "$LIBAVCODEC_VERSION" "$extralibs" "libavutil${build_suffix} = $LIBAVUTIL_VERSION"
90	+pkgconfig_generate libavformat "FFmpeg container format library" "$LIBAVFORMAT_VERSION" "$extralibs" "libavcodec${build_suffix} = $LIBAVCODEC_VERSION"
91	pkgconfig_generate libavdevice "FFmpeg device handling library" "$LIBAVDEVICE_VERSION" "$extralibs" "$libavdevice_pc_deps"
92	pkgconfig_generate libavfilter "FFmpeg video filtering library" "$LIBAVFILTER_VERSION" "$extralibs" "$libavfilter_pc_deps"
93	-pkgconfig_generate libpostproc "FFmpeg postprocessing library" "$LIBPOSTPROC_VERSION" "" "libavutil = $LIBAVUTIL_VERSION"
94	+pkgconfig_generate libpostproc "FFmpeg postprocessing library" "$LIBPOSTPROC_VERSION" "" "libavutil${build_suffix} = $LIBAVUTIL_VERSION"
95	pkgconfig_generate libavresample "Libav audio resampling library" "$LIBAVRESAMPLE_VERSION" "$extralibs"
96	-pkgconfig_generate libswscale "FFmpeg image rescaling library" "$LIBSWSCALE_VERSION" "$LIBM" "libavutil = $LIBAVUTIL_VERSION"
97	-pkgconfig_generate libswresample "FFmpeg audio rescaling library" "$LIBSWRESAMPLE_VERSION" "$LIBM" "libavutil = $LIBAVUTIL_VERSION"
98	+pkgconfig_generate libswscale "FFmpeg image rescaling library" "$LIBSWSCALE_VERSION" "$LIBM" "libavutil${build_suffix} = $LIBAVUTIL_VERSION"
99	+pkgconfig_generate libswresample "FFmpeg audio rescaling library" "$LIBSWRESAMPLE_VERSION" "$LIBM" "libavutil${build_suffix} = $LIBAVUTIL_VERSION"
100
101	fix_ffmpeg_remote(){
102	git_remote_from=$1

Lines 4-13 Link Here

(-)b/multimedia/ffmpeg1/files/patch-library.mak (-4 / +3 lines)
4	$(Q)mkdir -p "$(INCINSTDIR)"	4	$(Q)mkdir -p "$(INCINSTDIR)"
5	$$(INSTALL) -m 644 $$^ "$(INCINSTDIR)"	5	$$(INSTALL) -m 644 $$^ "$(INCINSTDIR)"
6		6
7	-install-lib$(NAME)-pkgconfig: $(SUBDIR)lib$(NAME).pc	7	install-lib$(NAME)-pkgconfig: $(SUBDIR)lib$(FULLNAME).pc
8	- $(Q)mkdir -p "$(LIBDIR)/pkgconfig"	8	- $(Q)mkdir -p "$(LIBDIR)/pkgconfig"
9	- $$(INSTALL) -m 644 $$^ "$(LIBDIR)/pkgconfig"	9	- $$(INSTALL) -m 644 $$^ "$(LIBDIR)/pkgconfig"
10	+install-lib$(NAME)-pkgconfig: $(SUBDIR)lib$(NAME)$(BUILDSUF).pc
11	+ $(Q)mkdir -p "$(prefix)/libdata/pkgconfig"	10	+ $(Q)mkdir -p "$(prefix)/libdata/pkgconfig"
12	+ $$(INSTALL) -m 644 $$^ "$(prefix)/libdata/pkgconfig"	11	+ $$(INSTALL) -m 644 $$^ "$(prefix)/libdata/pkgconfig"
13		12
Lines 17-24 Link Here
17		16
18	uninstall-headers::	17	uninstall-headers::
19	$(RM) $(addprefix "$(INCINSTDIR)/",$(HEADERS) $(BUILT_HEADERS))	18	$(RM) $(addprefix "$(INCINSTDIR)/",$(HEADERS) $(BUILT_HEADERS))
20	- $(RM) "$(LIBDIR)/pkgconfig/lib$(NAME).pc"	19	- $(RM) "$(LIBDIR)/pkgconfig/lib$(FULLNAME).pc"
21	+ $(RM) "$(prefix)/libdata/pkgconfig/lib$(NAME).pc"	20	+ $(RM) "$(prefix)/libdata/pkgconfig/lib$(FULLNAME).pc"
22	-rmdir "$(INCINSTDIR)"	21	-rmdir "$(INCINSTDIR)"
23	endef	22	endef
24		23

Lines 38-43 include/ffmpeg%%SUFF%%/libavutil/base64.h Link Here

(-)b/multimedia/ffmpeg1/pkg-plist (-9 / +16 lines)
38	include/ffmpeg%%SUFF%%/libavutil/blowfish.h	38	include/ffmpeg%%SUFF%%/libavutil/blowfish.h
39	include/ffmpeg%%SUFF%%/libavutil/bprint.h	39	include/ffmpeg%%SUFF%%/libavutil/bprint.h
40	include/ffmpeg%%SUFF%%/libavutil/bswap.h	40	include/ffmpeg%%SUFF%%/libavutil/bswap.h
		41	include/ffmpeg%%SUFF%%/libavutil/channel_layout.h
41	include/ffmpeg%%SUFF%%/libavutil/common.h	42	include/ffmpeg%%SUFF%%/libavutil/common.h
42	include/ffmpeg%%SUFF%%/libavutil/cpu.h	43	include/ffmpeg%%SUFF%%/libavutil/cpu.h
43	include/ffmpeg%%SUFF%%/libavutil/crc.h	44	include/ffmpeg%%SUFF%%/libavutil/crc.h
Lines 46-51 include/ffmpeg%%SUFF%%/libavutil/error.h Link Here
46	include/ffmpeg%%SUFF%%/libavutil/eval.h	47	include/ffmpeg%%SUFF%%/libavutil/eval.h
47	include/ffmpeg%%SUFF%%/libavutil/fifo.h	48	include/ffmpeg%%SUFF%%/libavutil/fifo.h
48	include/ffmpeg%%SUFF%%/libavutil/file.h	49	include/ffmpeg%%SUFF%%/libavutil/file.h
		50	include/ffmpeg%%SUFF%%/libavutil/hmac.h
49	include/ffmpeg%%SUFF%%/libavutil/imgutils.h	51	include/ffmpeg%%SUFF%%/libavutil/imgutils.h
50	include/ffmpeg%%SUFF%%/libavutil/intfloat.h	52	include/ffmpeg%%SUFF%%/libavutil/intfloat.h
51	include/ffmpeg%%SUFF%%/libavutil/intfloat_readwrite.h	53	include/ffmpeg%%SUFF%%/libavutil/intfloat_readwrite.h
Lines 56-61 include/ffmpeg%%SUFF%%/libavutil/lzo.h Link Here
56	include/ffmpeg%%SUFF%%/libavutil/mathematics.h	58	include/ffmpeg%%SUFF%%/libavutil/mathematics.h
57	include/ffmpeg%%SUFF%%/libavutil/md5.h	59	include/ffmpeg%%SUFF%%/libavutil/md5.h
58	include/ffmpeg%%SUFF%%/libavutil/mem.h	60	include/ffmpeg%%SUFF%%/libavutil/mem.h
		61	include/ffmpeg%%SUFF%%/libavutil/old_pix_fmts.h
59	include/ffmpeg%%SUFF%%/libavutil/opt.h	62	include/ffmpeg%%SUFF%%/libavutil/opt.h
60	include/ffmpeg%%SUFF%%/libavutil/parseutils.h	63	include/ffmpeg%%SUFF%%/libavutil/parseutils.h
61	include/ffmpeg%%SUFF%%/libavutil/pixdesc.h	64	include/ffmpeg%%SUFF%%/libavutil/pixdesc.h
Lines 70-110 include/ffmpeg%%SUFF%%/libavutil/timestamp.h Link Here
70	include/ffmpeg%%SUFF%%/libavutil/version.h	73	include/ffmpeg%%SUFF%%/libavutil/version.h
71	include/ffmpeg%%SUFF%%/libavutil/xtea.h	74	include/ffmpeg%%SUFF%%/libavutil/xtea.h
72	include/ffmpeg%%SUFF%%/libpostproc/postprocess.h	75	include/ffmpeg%%SUFF%%/libpostproc/postprocess.h
		76	include/ffmpeg%%SUFF%%/libpostproc/version.h
73	include/ffmpeg%%SUFF%%/libswresample/swresample.h	77	include/ffmpeg%%SUFF%%/libswresample/swresample.h
		78	include/ffmpeg%%SUFF%%/libswresample/version.h
74	include/ffmpeg%%SUFF%%/libswscale/swscale.h	79	include/ffmpeg%%SUFF%%/libswscale/swscale.h
75	include/ffmpeg%%SUFF%%/libswscale/version.h	80	include/ffmpeg%%SUFF%%/libswscale/version.h
76	lib/ffmpeg%%SUFF%%/libavcodec%%SUFF%%.a	81	lib/ffmpeg%%SUFF%%/libavcodec%%SUFF%%.a
77	lib/ffmpeg%%SUFF%%/libavcodec%%SUFF%%.so	82	lib/ffmpeg%%SUFF%%/libavcodec%%SUFF%%.so
78	lib/ffmpeg%%SUFF%%/libavcodec%%SUFF%%.so.54	83	lib/ffmpeg%%SUFF%%/libavcodec%%SUFF%%.so.54
79	lib/ffmpeg%%SUFF%%/libavcodec%%SUFF%%.so.54.59.100	84	lib/ffmpeg%%SUFF%%/libavcodec%%SUFF%%.so.54.92.100
80	lib/ffmpeg%%SUFF%%/libavdevice%%SUFF%%.a	85	lib/ffmpeg%%SUFF%%/libavdevice%%SUFF%%.a
81	lib/ffmpeg%%SUFF%%/libavdevice%%SUFF%%.so	86	lib/ffmpeg%%SUFF%%/libavdevice%%SUFF%%.so
82	lib/ffmpeg%%SUFF%%/libavdevice%%SUFF%%.so.54	87	lib/ffmpeg%%SUFF%%/libavdevice%%SUFF%%.so.54
83	lib/ffmpeg%%SUFF%%/libavdevice%%SUFF%%.so.54.2.101	88	lib/ffmpeg%%SUFF%%/libavdevice%%SUFF%%.so.54.3.103
84	lib/ffmpeg%%SUFF%%/libavfilter%%SUFF%%.a	89	lib/ffmpeg%%SUFF%%/libavfilter%%SUFF%%.a
85	lib/ffmpeg%%SUFF%%/libavfilter%%SUFF%%.so	90	lib/ffmpeg%%SUFF%%/libavfilter%%SUFF%%.so
86	lib/ffmpeg%%SUFF%%/libavfilter%%SUFF%%.so.3	91	lib/ffmpeg%%SUFF%%/libavfilter%%SUFF%%.so.3
87	lib/ffmpeg%%SUFF%%/libavfilter%%SUFF%%.so.3.17.100	92	lib/ffmpeg%%SUFF%%/libavfilter%%SUFF%%.so.3.42.103
88	lib/ffmpeg%%SUFF%%/libavformat%%SUFF%%.a	93	lib/ffmpeg%%SUFF%%/libavformat%%SUFF%%.a
89	lib/ffmpeg%%SUFF%%/libavformat%%SUFF%%.so	94	lib/ffmpeg%%SUFF%%/libavformat%%SUFF%%.so
90	lib/ffmpeg%%SUFF%%/libavformat%%SUFF%%.so.54	95	lib/ffmpeg%%SUFF%%/libavformat%%SUFF%%.so.54
91	lib/ffmpeg%%SUFF%%/libavformat%%SUFF%%.so.54.29.104	96	lib/ffmpeg%%SUFF%%/libavformat%%SUFF%%.so.54.63.104
92	lib/ffmpeg%%SUFF%%/libavutil%%SUFF%%.a	97	lib/ffmpeg%%SUFF%%/libavutil%%SUFF%%.a
93	lib/ffmpeg%%SUFF%%/libavutil%%SUFF%%.so	98	lib/ffmpeg%%SUFF%%/libavutil%%SUFF%%.so
94	lib/ffmpeg%%SUFF%%/libavutil%%SUFF%%.so.51	99	lib/ffmpeg%%SUFF%%/libavutil%%SUFF%%.so.52
95	lib/ffmpeg%%SUFF%%/libavutil%%SUFF%%.so.51.73.101	100	lib/ffmpeg%%SUFF%%/libavutil%%SUFF%%.so.52.18.100
96	lib/ffmpeg%%SUFF%%/libpostproc%%SUFF%%.a	101	lib/ffmpeg%%SUFF%%/libpostproc%%SUFF%%.a
97	lib/ffmpeg%%SUFF%%/libpostproc%%SUFF%%.so	102	lib/ffmpeg%%SUFF%%/libpostproc%%SUFF%%.so
98	lib/ffmpeg%%SUFF%%/libpostproc%%SUFF%%.so.52	103	lib/ffmpeg%%SUFF%%/libpostproc%%SUFF%%.so.52
99	lib/ffmpeg%%SUFF%%/libpostproc%%SUFF%%.so.52.0.100	104	lib/ffmpeg%%SUFF%%/libpostproc%%SUFF%%.so.52.2.100
100	lib/ffmpeg%%SUFF%%/libswresample%%SUFF%%.a	105	lib/ffmpeg%%SUFF%%/libswresample%%SUFF%%.a
101	lib/ffmpeg%%SUFF%%/libswresample%%SUFF%%.so	106	lib/ffmpeg%%SUFF%%/libswresample%%SUFF%%.so
102	lib/ffmpeg%%SUFF%%/libswresample%%SUFF%%.so.0	107	lib/ffmpeg%%SUFF%%/libswresample%%SUFF%%.so.0
103	lib/ffmpeg%%SUFF%%/libswresample%%SUFF%%.so.0.15.100	108	lib/ffmpeg%%SUFF%%/libswresample%%SUFF%%.so.0.17.102
104	lib/ffmpeg%%SUFF%%/libswscale%%SUFF%%.a	109	lib/ffmpeg%%SUFF%%/libswscale%%SUFF%%.a
105	lib/ffmpeg%%SUFF%%/libswscale%%SUFF%%.so	110	lib/ffmpeg%%SUFF%%/libswscale%%SUFF%%.so
106	lib/ffmpeg%%SUFF%%/libswscale%%SUFF%%.so.2	111	lib/ffmpeg%%SUFF%%/libswscale%%SUFF%%.so.2
107	lib/ffmpeg%%SUFF%%/libswscale%%SUFF%%.so.2.1.101	112	lib/ffmpeg%%SUFF%%/libswscale%%SUFF%%.so.2.2.100
108	libdata/pkgconfig/libavcodec%%SUFF%%.pc	113	libdata/pkgconfig/libavcodec%%SUFF%%.pc
109	libdata/pkgconfig/libavdevice%%SUFF%%.pc	114	libdata/pkgconfig/libavdevice%%SUFF%%.pc
110	libdata/pkgconfig/libavfilter%%SUFF%%.pc	115	libdata/pkgconfig/libavfilter%%SUFF%%.pc
Lines 114-125 libdata/pkgconfig/libpostproc%%SUFF%%.pc Link Here
114	libdata/pkgconfig/libswresample%%SUFF%%.pc	119	libdata/pkgconfig/libswresample%%SUFF%%.pc
115	libdata/pkgconfig/libswscale%%SUFF%%.pc	120	libdata/pkgconfig/libswscale%%SUFF%%.pc
116	%%DATADIR%%/examples/Makefile	121	%%DATADIR%%/examples/Makefile
		122	%%DATADIR%%/examples/README
117	%%DATADIR%%/examples/decoding_encoding.c	123	%%DATADIR%%/examples/decoding_encoding.c
118	%%DATADIR%%/examples/demuxing.c	124	%%DATADIR%%/examples/demuxing.c
119	%%DATADIR%%/examples/filtering_audio.c	125	%%DATADIR%%/examples/filtering_audio.c
120	%%DATADIR%%/examples/filtering_video.c	126	%%DATADIR%%/examples/filtering_video.c
121	%%DATADIR%%/examples/metadata.c	127	%%DATADIR%%/examples/metadata.c
122	%%DATADIR%%/examples/muxing.c	128	%%DATADIR%%/examples/muxing.c
		129	%%DATADIR%%/examples/resampling_audio.c
123	%%DATADIR%%/examples/scaling_video.c	130	%%DATADIR%%/examples/scaling_video.c
124	%%DATADIR%%/ffprobe.xsd	131	%%DATADIR%%/ffprobe.xsd
125	%%DATADIR%%/libvpx-1080p.ffpreset	132	%%DATADIR%%/libvpx-1080p.ffpreset