1 |
commit: 5f2232110a087c77505b1e19f162c60fe6e33501 |
2 |
Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Jul 19 08:13:55 2017 +0000 |
4 |
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jul 19 08:55:54 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f223211 |
7 |
|
8 |
media-libs/raspberrypi-userland: tidy up ebuild and add missing dies. |
9 |
|
10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.1 |
11 |
|
12 |
.../raspberrypi-userland-0_pre20160424.ebuild | 26 +++++++++++++--------- |
13 |
1 file changed, 15 insertions(+), 11 deletions(-) |
14 |
|
15 |
diff --git a/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20160424.ebuild b/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20160424.ebuild |
16 |
index 44af1834f38..fb3240d5919 100644 |
17 |
--- a/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20160424.ebuild |
18 |
+++ b/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20160424.ebuild |
19 |
@@ -19,9 +19,12 @@ else |
20 |
S="${WORKDIR}/raspberrypi-userland-${GIT_COMMIT}" |
21 |
fi |
22 |
|
23 |
-RDEPEND="!media-libs/raspberrypi-userland-bin |
24 |
+RDEPEND=" |
25 |
+ !media-libs/raspberrypi-userland-bin |
26 |
wayland? ( dev-libs/wayland )" |
27 |
-DEPEND="${RDEPEND} |
28 |
+ |
29 |
+DEPEND=" |
30 |
+ ${RDEPEND} |
31 |
wayland? ( virtual/pkgconfig )" |
32 |
|
33 |
IUSE="examples wayland" |
34 |
@@ -66,7 +69,7 @@ src_install() { |
35 |
dosym ../../../opt/vc /usr/lib/opengl/${PN} |
36 |
|
37 |
# tell eselect opengl that we do not have libGL |
38 |
- touch "${ED}"/opt/vc/.gles-only |
39 |
+ touch "${ED}"/opt/vc/.gles-only || die |
40 |
|
41 |
insinto /opt/vc/lib/pkgconfig |
42 |
doins "${FILESDIR}"/bcm_host.pc |
43 |
@@ -74,7 +77,7 @@ src_install() { |
44 |
doins "${FILESDIR}"/glesv2.pc |
45 |
if use wayland; then |
46 |
# Missing wayland-egl version from the patch; claim 9.0 (a mesa version) for now, so gst-plugins-bad wayland-egl check is happy |
47 |
- sed -i -e 's/Version: /Version: 9.0/' "${ED}"/opt/vc/lib/pkgconfig/wayland-egl.pc |
48 |
+ sed -i -e 's/Version: /Version: 9.0/' "${ED}/opt/vc/lib/pkgconfig/wayland-egl.pc" || die |
49 |
doins "${ED}"/opt/vc/lib/pkgconfig/wayland-egl.pc # Maybe move? |
50 |
fi |
51 |
|
52 |
@@ -82,24 +85,25 @@ src_install() { |
53 |
einfo "Fixing #include \"vcos_platform_types.h\"" |
54 |
for file in $(grep -l "#include \"vcos_platform_types.h\"" "${D}"/opt/vc/include/* -r); do |
55 |
einfo " Fixing file ${file}" |
56 |
- sed -i "s%#include \"vcos_platform_types.h\"%#include \"interface/vcos/pthreads/vcos_platform_types.h\"%g" ${file} |
57 |
+ sed -i "s%#include \"vcos_platform_types.h\"%#include \"interface/vcos/pthreads/vcos_platform_types.h\"%g" ${file} || die |
58 |
done |
59 |
+ |
60 |
einfo "Fixing #include \"vcos_platform.h\"" |
61 |
for file in $(grep -l "#include \"vcos_platform.h\"" "${D}"/opt/vc/include/* -r); do |
62 |
einfo " Fixing file ${file}" |
63 |
- sed -i "s%#include \"vcos_platform.h\"%#include \"interface/vcos/pthreads/vcos_platform.h\"%g" ${file} |
64 |
+ sed -i "s%#include \"vcos_platform.h\"%#include \"interface/vcos/pthreads/vcos_platform.h\"%g" ${file} || die |
65 |
done |
66 |
+ |
67 |
einfo "Fixing #include \"vchost_config.h\"" |
68 |
for file in $(grep -l "#include \"vchost_config.h\"" "${D}"/opt/vc/include/* -r); do |
69 |
einfo " Fixing file ${file}" |
70 |
- sed -i "s%#include \"vchost_config.h\"%#include \"interface/vmcs_host/linux/vchost_config.h\"%g" ${file} |
71 |
+ sed -i "s%#include \"vchost_config.h\"%#include \"interface/vmcs_host/linux/vchost_config.h\"%g" ${file} || die |
72 |
done |
73 |
|
74 |
- if use examples ; then |
75 |
+ if use examples; then |
76 |
dodir /usr/share/doc/${PF}/examples |
77 |
mv "${D}"/opt/vc/src/hello_pi "${D}"/usr/share/doc/${PF}/examples/ || die |
78 |
- rm -fr "${D}"/opt/vc/src |
79 |
- else |
80 |
- rm -fr "${D}/opt/vc/src" |
81 |
fi |
82 |
+ |
83 |
+ rm -rfv "${D}"/opt/vc/src || die |
84 |
} |