1 |
commit: 53eace1f6281067889b6200682253e5c43941a79 |
2 |
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Jun 2 09:30:17 2016 +0000 |
4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jun 2 09:31:01 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53eace1f |
7 |
|
8 |
media-video/raspberrypi-omxplayer: applied makefile fix from Ahmet Inan <xdsopl <AT> googlemail.com> from bug #421683 comment #44 and #45 |
9 |
|
10 |
Package-Manager: portage-2.3.0_rc1 |
11 |
|
12 |
.../files/Makefile-0_p20160528.patch | 26 ++++++++++++++++++++++ |
13 |
media-video/raspberrypi-omxplayer/patch | 26 ---------------------- |
14 |
.../raspberrypi-omxplayer-0_p20160528.ebuild | 4 ++-- |
15 |
3 files changed, 28 insertions(+), 28 deletions(-) |
16 |
|
17 |
diff --git a/media-video/raspberrypi-omxplayer/files/Makefile-0_p20160528.patch b/media-video/raspberrypi-omxplayer/files/Makefile-0_p20160528.patch |
18 |
new file mode 100644 |
19 |
index 0000000..eb65f5d |
20 |
--- /dev/null |
21 |
+++ b/media-video/raspberrypi-omxplayer/files/Makefile-0_p20160528.patch |
22 |
@@ -0,0 +1,26 @@ |
23 |
+--- omxplayer-9999/Makefile |
24 |
++++ omxplayer-9999/Makefile |
25 |
+@@ -2,9 +2,11 @@ |
26 |
+ |
27 |
+ CFLAGS+=-std=c++0x -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS -DTARGET_POSIX -DTARGET_LINUX -fPIC -DPIC -D_REENTRANT -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -DHAVE_CMAKE_CONFIG -D__VIDEOCORE4__ -U_FORTIFY_SOURCE -Wall -DHAVE_OMXLIB -DUSE_EXTERNAL_FFMPEG -DHAVE_LIBAVCODEC_AVCODEC_H -DHAVE_LIBAVUTIL_OPT_H -DHAVE_LIBAVUTIL_MEM_H -DHAVE_LIBAVUTIL_AVUTIL_H -DHAVE_LIBAVFORMAT_AVFORMAT_H -DHAVE_LIBAVFILTER_AVFILTER_H -DHAVE_LIBSWRESAMPLE_SWRESAMPLE_H -DOMX -DOMX_SKIP64BIT -ftree-vectorize -DUSE_EXTERNAL_OMX -DTARGET_RASPBERRY_PI -DUSE_EXTERNAL_LIBBCM_HOST |
28 |
+ |
29 |
+-LDFLAGS+=-L./ -Lffmpeg_compiled/usr/local/lib/ -lc -lWFC -lGLESv2 -lEGL -lbcm_host -lopenmaxil -lfreetype -lz |
30 |
++PKGS=freetype2 dbus-1 libavcodec libavutil libavformat libswresample libswscale libpcre |
31 |
++ |
32 |
++LIBS+=-lrt -lpthread $(shell pkg-config --libs $(PKGS)) -L/opt/vc/lib |
33 |
+ |
34 |
+-INCLUDES+=-I./ -Ilinux -Iffmpeg_compiled/usr/local/include/ -I /usr/include/dbus-1.0 -I /usr/lib/arm-linux-gnueabihf/dbus-1.0/include |
35 |
++INCLUDES+=$(shell pkg-config --cflags $(PKGS)) -I/opt/vc/include -I. -Ilinux |
36 |
+ |
37 |
+ DIST ?= omxplayer-dist |
38 |
+ |
39 |
+@@ -51,8 +47,7 @@ |
40 |
+ bash gen_version.sh > version.h |
41 |
+ |
42 |
+ omxplayer.bin: version $(OBJS) |
43 |
+- $(CXX) $(LDFLAGS) -o omxplayer.bin $(OBJS) -lvchiq_arm -lvchostif -lvcos -ldbus-1 -lrt -lpthread -lavutil -lavcodec -lavformat -lswscale -lswresample -lpcre |
44 |
+- $(STRIP) omxplayer.bin |
45 |
++ $(CXX) $(LDFLAGS) -o omxplayer.bin $(OBJS) $(LIBS) |
46 |
+ |
47 |
+ help.h: README.md Makefile |
48 |
+ awk '/SYNOPSIS/{p=1;print;next} p&&/KEY BINDINGS/{p=0};p' $< \ |
49 |
|
50 |
diff --git a/media-video/raspberrypi-omxplayer/patch b/media-video/raspberrypi-omxplayer/patch |
51 |
deleted file mode 100644 |
52 |
index d9b5b6b..0000000 |
53 |
--- a/media-video/raspberrypi-omxplayer/patch |
54 |
+++ /dev/null |
55 |
@@ -1,26 +0,0 @@ |
56 |
---- raspberrypi-omxplayer-9999.ebuild 2016-03-09 00:09:34.000000000 +0100 |
57 |
-+++ raspberrypi-omxplayer-9999.ebuild 2016-05-31 10:01:58.335198495 +0200 |
58 |
-@@ -14,7 +14,7 @@ |
59 |
- LICENSE="GPL-2" |
60 |
- SLOT="0" |
61 |
- KEYWORDS="~arm" |
62 |
--IUSE="" |
63 |
-+IUSE="X" |
64 |
- |
65 |
- RDEPEND="dev-libs/libpcre |
66 |
- media-fonts/freefont |
67 |
-@@ -22,8 +22,12 @@ |
68 |
- sys-apps/dbus |
69 |
- sys-apps/fbset |
70 |
- virtual/ffmpeg |
71 |
-- x11-apps/xrefresh |
72 |
-- x11-apps/xset" |
73 |
-+ dev-libs/boost |
74 |
-+ media-libs/freetype:2 |
75 |
-+ X? ( |
76 |
-+ x11-apps/xrefresh |
77 |
-+ x11-apps/xset |
78 |
-+ )" |
79 |
- DEPEND="${RDEPEND} |
80 |
- virtual/pkgconfig" |
81 |
- |
82 |
|
83 |
diff --git a/media-video/raspberrypi-omxplayer/raspberrypi-omxplayer-0_p20160528.ebuild b/media-video/raspberrypi-omxplayer/raspberrypi-omxplayer-0_p20160528.ebuild |
84 |
index 4a29459..83e030a 100644 |
85 |
--- a/media-video/raspberrypi-omxplayer/raspberrypi-omxplayer-0_p20160528.ebuild |
86 |
+++ b/media-video/raspberrypi-omxplayer/raspberrypi-omxplayer-0_p20160528.ebuild |
87 |
@@ -34,11 +34,11 @@ DEPEND="${RDEPEND} |
88 |
S="${WORKDIR}/popcornmix-omxplayer-${GIT_COMMIT}" |
89 |
|
90 |
src_prepare() { |
91 |
- epatch "${FILESDIR}"/Makefile-0_p20160217.patch \ |
92 |
+ epatch "${FILESDIR}"/Makefile-0_p20160528.patch \ |
93 |
"${FILESDIR}"/fonts-path.patch |
94 |
|
95 |
cat > Makefile.include << EOF |
96 |
-LIBS=-lvchiq_arm -lvcos -lbcm_host -lEGL -lGLESv2 -lopenmaxil -lrt -lpthread |
97 |
+LIBS=-lvchostif -lvchiq_arm -lvcos -lbcm_host -lEGL -lGLESv2 -lopenmaxil -lrt -lpthread |
98 |
EOF |
99 |
|
100 |
tc-export CXX |