[gentoo-commits] repo/gentoo:master commit in: media-libs/raspberrypi-userland/files/

2021-02-14 Thread Conrad Kostecki
commit: 9cbaffb767a7eb275d54f9666584e235d9d0566e
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Sun Feb 14 09:50:43 2021 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Sun Feb 14 13:58:21 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9cbaffb7

media-libs/raspberrypi-userland: remove unused files/patch

Closes: https://github.com/gentoo/gentoo/pull/19461
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Signed-off-by: Conrad Kostecki  gentoo.org>

 .../files/04raspberrypi-userland   |   3 -
 media-libs/raspberrypi-userland/files/bcm_host.pc  |  10 -
 media-libs/raspberrypi-userland/files/egl.pc   |  11 --
 media-libs/raspberrypi-userland/files/glesv2.pc|  11 --
 .../files/next-resource-handle.patch   | 207 -
 5 files changed, 242 deletions(-)

diff --git a/media-libs/raspberrypi-userland/files/04raspberrypi-userland 
b/media-libs/raspberrypi-userland/files/04raspberrypi-userland
deleted file mode 100644
index 17b493b1814..000
--- a/media-libs/raspberrypi-userland/files/04raspberrypi-userland
+++ /dev/null
@@ -1,3 +0,0 @@
-PKG_CONFIG_PATH='/opt/vc/lib/pkgconfig'
-PATH='/opt/vc/bin'
-LDPATH='/opt/vc/lib'

diff --git a/media-libs/raspberrypi-userland/files/bcm_host.pc 
b/media-libs/raspberrypi-userland/files/bcm_host.pc
deleted file mode 100644
index 7627ae87105..000
--- a/media-libs/raspberrypi-userland/files/bcm_host.pc
+++ /dev/null
@@ -1,10 +0,0 @@
-prefix=/opt/vc
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: bcm_host
-Description: Broadcom VideoCore host API library
-Version: 1
-Libs: -L${libdir} -lbcm_host -lvcos -lvchiq_arm
-Cflags: -I${includedir} -I${includedir}/interface/vmcs_host/linux 
-I${includedir}/interface/vcos/pthreads -DUSE_VCHIQ_ARM

diff --git a/media-libs/raspberrypi-userland/files/egl.pc 
b/media-libs/raspberrypi-userland/files/egl.pc
deleted file mode 100644
index 56bf1e07e93..000
--- a/media-libs/raspberrypi-userland/files/egl.pc
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=/opt/vc
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: EGL
-Description: Fake EGL package for RPi
-Version: 10
-Requires: bcm_host glesv2
-Libs: -L${libdir} -lEGL
-Cflags: -I${includedir}

diff --git a/media-libs/raspberrypi-userland/files/glesv2.pc 
b/media-libs/raspberrypi-userland/files/glesv2.pc
deleted file mode 100644
index 04d61c21cea..000
--- a/media-libs/raspberrypi-userland/files/glesv2.pc
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=/opt/vc
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: GLESv2
-Description: Fake GL ES 2 package for RPi
-Version: 10
-Requires: bcm_host
-Libs: -L${libdir} -lGLESv2
-Cflags: -I${includedir}

diff --git a/media-libs/raspberrypi-userland/files/next-resource-handle.patch 
b/media-libs/raspberrypi-userland/files/next-resource-handle.patch
deleted file mode 100644
index 45e1a494b2c..000
--- a/media-libs/raspberrypi-userland/files/next-resource-handle.patch
+++ /dev/null
@@ -1,207 +0,0 @@
-From 825c3236e5908ff003644abd870bfe98e82722b2 Mon Sep 17 00:00:00 2001
-From: Dom Cobley 
-Date: Tue, 9 Jul 2013 09:26:26 -0400
-Subject: [PATCH] Allow applications to set next resource handle
-
-This patch adds provisions in userland to
-let apps callers set the next rendereing dispmanx resource.
-It's useful for implementing, say, a buffer carousel.

- interface/khronos/common/khrn_client_rpc.h |  2 ++
- interface/khronos/common/khrn_int_ids.h|  2 ++
- interface/khronos/egl/egl_client.c | 30 +++---
- interface/khronos/egl/egl_client_surface.c | 24 +++-
- interface/khronos/egl/egl_client_surface.h |  3 ++-
- interface/khronos/egl/egl_int_impl.h   |  5 +++--
- 6 files changed, 59 insertions(+), 7 deletions(-)
-
-diff --git a/interface/khronos/common/khrn_client_rpc.h 
b/interface/khronos/common/khrn_client_rpc.h
-index 418aa67..a7557a8 100644
 a/interface/khronos/common/khrn_client_rpc.h
-+++ b/interface/khronos/common/khrn_client_rpc.h
-@@ -683,6 +683,7 @@ static INLINE void rpc_call18(CLIENT_THREAD_STATE_T 
*thread, uint32_t id, uint32
- static INLINE void rpc_call13_out_ctrl(CLIENT_THREAD_STATE_T *thread,uint32_t 
id, uint32_t p0, uint32_t p1, uint32_t p2, uint32_t p3, uint32_t p4, uint32_t 
p5, uint32_t p6, uint32_t p7, uint32_t p8, uint32_t p9, uint32_t p10, uint32_t 
p11, void *out)   { rpc_begin(thread); RPC_CALL(thread, id, p0, p1, 
p2, p3, p4, p5, p6, p7, p8, p9, p10, p11);  rpc_recv(thread, out, NULL, 
(RPC_RECV_FLAG_T)(RPC_RECV_FLAG_CTRL | RPC_RECV_FLAG_LEN)); rpc_end(thread); }
- static INLINE void rpc_call14_out_ctrl(CLIENT_THREAD_STATE_T *thread,uint32_t 
id, uint32_t p0, uint32_t p1, uint32_t p2, uint32_t p3, uint32_t p4, uint32_t 
p5, uint32_t p6, uint32_t p7, uint32_t p8, uint3

[gentoo-commits] repo/gentoo:master commit in: media-libs/raspberrypi-userland/files/, media-libs/raspberrypi-userland/

2020-11-22 Thread Sam James
commit: d7fbeb6481a6ffda252f343cc303533fbad5
Author: Peter Alfredsen  icloud  com>
AuthorDate: Fri Nov 13 13:27:58 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Nov 23 04:42:03 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7fbeb64

media-libs/raspberrypi-userland: Version bump 0_pre20201022

* Add -0_pre20201022, also update - to same standard.
* Patches described in ebuild.
* raspberrypi-userland produces libEGL and libbrcmEGL, libGLESv2 and
libbrcmGLESv2 libraries. Only the libbrcm variants are actually
needed, plus the other variants collide with libglvnd.
Thanks to KalleBlom on IRC for reporting.
* More closely sync with Raspbian which libs we don't install.
The source for this package is a mess. We build all kinds of things that
just aren't installed, and by default install many things that
shouldn't be.
* Many .so files are not built on arm64, but currently we install
the .pc files anyway. Fix by including the .pc files in the ARM64
conditional.

Closes: https://bugs.gentoo.org/754249
Closes: https://bugs.gentoo.org/718366
Closes: https://bugs.gentoo.org/671492
Closes: https://bugs.gentoo.org/620774
Signed-off-by: Peter Alfredsen  icloud.com>
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Sam James  gentoo.org>

 media-libs/raspberrypi-userland/Manifest   |   1 +
 .../files/raspberrypi-userland-include.patch   |  19 ++
 .../files/raspberrypi-userland-libdir.patch| 316 +
 .../files/raspberrypi-userland-libfdt-static.patch |  22 ++
 .../files/raspberrypi-userland-pkgconf-arm64.patch |  38 +++
 .../raspberrypi-userland-0_pre20201022.ebuild  |  69 +
 .../raspberrypi-userland-.ebuild   |  65 +++--
 7 files changed, 511 insertions(+), 19 deletions(-)

diff --git a/media-libs/raspberrypi-userland/Manifest 
b/media-libs/raspberrypi-userland/Manifest
index 0b6aea310c4..29025c84702 100644
--- a/media-libs/raspberrypi-userland/Manifest
+++ b/media-libs/raspberrypi-userland/Manifest
@@ -1 +1,2 @@
 DIST raspberrypi-userland-0_pre20160424.tar.gz 32933952 BLAKE2B 
4a2d40200a6a4d673be277a0958f768342a2777c28b14b4c7fcac1dbc9c59f2ef2485234f11fbd228aea6bbcf4982a3fd1d4825268af60be91665ea6fee6922d
 SHA512 
04a71837b1247ecbbe479b3b09b5705638a9e576dc99a1ab2200727509195a4a2f2a9b184e3c23ce3933a3236b260afc8bd2b75bc218567b386445bdd8208a5b
+DIST raspberrypi-userland-0_pre20201022.tar.gz 32958590 BLAKE2B 
01733a24822d80c5bf9aa3e0feefc3e9437390a465d7a4184d0a9c6a68446e91515d3d6d398ff516d9fd1bdcd4a885512d358a4ed1d24d9b94bdc72d81db84d3
 SHA512 
1813224068b8a8e569c874a8ffb354f1ac86e95b482caaad18b9703a187baaea60f1f87dfbb0c7e4b3cb2eb875abbcc82aedba410646a3c1df0208bd73aaf9f9

diff --git 
a/media-libs/raspberrypi-userland/files/raspberrypi-userland-include.patch 
b/media-libs/raspberrypi-userland/files/raspberrypi-userland-include.patch
new file mode 100644
index 000..83556be3ae4
--- /dev/null
+++ b/media-libs/raspberrypi-userland/files/raspberrypi-userland-include.patch
@@ -0,0 +1,19 @@
+diff -NrU5 1/makefiles/cmake/vmcs.cmake 2/makefiles/cmake/vmcs.cmake
+--- 1/makefiles/cmake/vmcs.cmake   2020-11-06 14:21:49.103179336 +0100
 2/makefiles/cmake/vmcs.cmake   2020-11-06 17:00:57.410230948 +0100
+@@ -72,10 +72,14 @@
+ install(DIRECTORY ${vmcs_root}/interface/vctypes   DESTINATION 
${VMCS_INSTALL_PREFIX}/include/interface FILES_MATCHING PATTERN "*.h")
+ install(DIRECTORY ${vmcs_root}/vcinclude   DESTINATION 
${VMCS_INSTALL_PREFIX}/include   FILES_MATCHING PATTERN "*.h")
+ install(DIRECTORY ${vmcs_root}/interface/peer  DESTINATION 
${VMCS_INSTALL_PREFIX}/include/interface FILES_MATCHING PATTERN "*.h")
+ install(DIRECTORY ${vmcs_root}/interface/vmcs_host DESTINATION 
${VMCS_INSTALL_PREFIX}/include/interface FILES_MATCHING PATTERN "*.h" PATTERN 
"${vmcs_root}/interface/vmcs_host/khronos" EXCLUDE)
+ 
+-install(DIRECTORY ${vmcs_root}/interface/khronos/include   DESTINATION 
${VMCS_INSTALL_PREFIX} FILES_MATCHING PATTERN "*.h")
++install(DIRECTORY ${vmcs_root}/interface/khronos/include   DESTINATION 
${VMCS_INSTALL_PREFIX} FILES_MATCHING PATTERN "*.h"
++  PATTERN EGL EXCLUDE
++  PATTERN GLES EXCLUDE
++  PATTERN GLES2 EXCLUDE
++  PATTERN KHR EXCLUDE )
+ install(DIRECTORY ${vmcs_root}/interface/vmcs_host/khronos/IL  DESTINATION 
${VMCS_INSTALL_PREFIX}/include FILES_MATCHING PATTERN "*.h")
+ 
+ install(DIRECTORY ${vmcs_root}/host_applications/linux/libs/bcm_host/include  
   DESTINATION ${VMCS_INSTALL_PREFIX}   FILES_MATCHING PATTERN "*.h")
+ 

diff --git 
a/media-libs/raspberrypi-userland/files/raspberrypi-userland-libdir.patch 
b/media-libs/raspberrypi-userland/files/raspberrypi-userland-libdir.patch
new file mode 100644
index 000..b1367a98232
--- /dev/null
+++ b/media-libs/raspberrypi-userland/files/raspberrypi-userland-libdir.patch
@@ -0,0 +1,316 @@
+From 9f2ba8c56e473fa05a5f216260571f4269fc16cc Mon Sep 17 00:00:00 2001
+

[gentoo-commits] repo/gentoo:master commit in: media-libs/raspberrypi-userland/files/, media-libs/raspberrypi-userland/

2017-07-19 Thread Patrice Clement
commit: 9d3fc9e26bf37065b6a435e233a105b34a14184a
Author: Patrice Clement  gentoo  org>
AuthorDate: Wed Jul 19 08:03:53 2017 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Wed Jul 19 08:55:16 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d3fc9e2

media-libs/raspberrypi-userland: remove empty file.

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 media-libs/raspberrypi-userland/files/wayland-wsys.patch   | 0
 .../raspberrypi-userland/raspberrypi-userland-0_pre20160424.ebuild | 3 +--
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/media-libs/raspberrypi-userland/files/wayland-wsys.patch 
b/media-libs/raspberrypi-userland/files/wayland-wsys.patch
deleted file mode 100644
index e69de29bb2d..000

diff --git 
a/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20160424.ebuild 
b/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20160424.ebuild
index e060f168f5d..44af1834f38 100644
--- a/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20160424.ebuild
+++ b/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20160424.ebuild
@@ -47,8 +47,7 @@ src_prepare() {
sed -i "/DESTINATION \/etc\/init.d/,+2d" 
interface/vmcs_host/linux/vcfiled/CMakeLists.txt || die
 
# wayland egl support
-   epatch "${FILESDIR}"/next-resource-handle.patch \
-   "${FILESDIR}"/wayland-wsys.patch
+   epatch "${FILESDIR}"/next-resource-handle.patch
 }
 
 src_install() {



[gentoo-commits] repo/gentoo:master commit in: media-libs/raspberrypi-userland/files/, media-libs/raspberrypi-userland/

2016-05-11 Thread Alfredo Tupone
commit: aa1bf72c3e52e5420c82fd1088032cf222447496
Author: Tupone Alfredo  gentoo  org>
AuthorDate: Wed May 11 12:25:26 2016 +
Commit: Alfredo Tupone  gentoo  org>
CommitDate: Wed May 11 12:26:56 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa1bf72c

media-libs/raspberrypi-userland: patches accepted by upstream

Package-Manager: portage-2.2.26

 .../files/raspberrypi-userland--gentoo.patch   | 60 --
 .../raspberrypi-userland-.ebuild   | 10 +++-
 2 files changed, 9 insertions(+), 61 deletions(-)

diff --git 
a/media-libs/raspberrypi-userland/files/raspberrypi-userland--gentoo.patch 
b/media-libs/raspberrypi-userland/files/raspberrypi-userland--gentoo.patch
index 2c465c7..f58e288 100644
--- 
a/media-libs/raspberrypi-userland/files/raspberrypi-userland--gentoo.patch
+++ 
b/media-libs/raspberrypi-userland/files/raspberrypi-userland--gentoo.patch
@@ -8,63 +8,3 @@
  
  # do we actually need this?
  add_definitions(-D__VIDEOCORE4__)
 interface/vchiq_arm/vchiq_test.c.old   2015-02-20 20:52:15.202983349 
+0100
-+++ interface/vchiq_arm/vchiq_test.c   2015-02-20 20:53:34.401882346 +0100
-@@ -130,6 +130,7 @@
- #ifdef __linux__
- 
- #include 
-+#include 
- #include "interface/vmcs_host/vc_cma.h"
- 
- static void reserve_test(int reserve, int delay)
-@@ -1311,6 +1312,7 @@
- clnt_callback(VCHIQ_REASON_T reason, VCHIQ_HEADER_T *header,
-VCHIQ_SERVICE_HANDLE_T service, void *bulk_userdata)
- {
-+   int data;
-vcos_mutex_lock(&g_mutex);
-if (reason == VCHIQ_MESSAGE_AVAILABLE)
-{
-@@ -1318,7 +1320,7 @@
-  vchiq_release_message(service, header);
-   else
-   /* Responses of length 0 are not sync points */
--  if ((header->size >= 4) && (*(int *)header->data == MSG_ECHO))
-+  if ((header->size >= 4) && (memcpy(&data, header->data, sizeof(data)), 
data == MSG_ECHO))
-   {
-  /* This is a complete echoed packet */
-  if (g_params.verify && (mem_check(header->data, 
bulk_tx_data[ctrl_received % NUM_BULK_BUFS], g_params.blocksize) != 0))
 makefiles/cmake/vmcs.cmake.old 2015-02-21 14:31:57.608527445 +0100
-+++ makefiles/cmake/vmcs.cmake 2015-02-21 14:32:09.358363958 +0100
-@@ -10,7 +10,7 @@
- if (ANDROID)
-   SET(VMCS_INSTALL_PREFIX "/vendor/brcm/islands" CACHE PATH "Prefix prepended 
to install directories" FORCE)
- else()
--  SET(VMCS_INSTALL_PREFIX "/opt/vc" CACHE PATH "Prefix prepended to install 
directories" FORCE)
-+  SET(VMCS_INSTALL_PREFIX "/usr" CACHE PATH "Prefix prepended to install 
directories" FORCE)
- endif()
- 
- SET(CMAKE_INSTALL_PREFIX "${VMCS_INSTALL_PREFIX}" CACHE INTERNAL "Prefix
 interface/vmcs_host/vcilcs_out.c.old   2015-02-24 06:57:20.91332 
+0100
-+++ interface/vmcs_host/vcilcs_out.c   2015-02-24 06:59:34.735428061 +0100
-@@ -37,6 +37,7 @@
- #include "interface/vmcs_host/vc_ilcs_defs.h"
- #include "interface/vmcs_host/vcilcs.h"
- #include "interface/vmcs_host/vcilcs_common.h"
-+#include "interface/vcos/vcos_dlfcn.h"
- 
- static VC_PRIVATE_PORT_T *find_port(VC_PRIVATE_COMPONENT_T *comp, OMX_U32 
nPortIndex)
- {
 interface/khronos/common/linux/khrn_client_rpc_linux.c.old 2015-02-24 
06:56:24.458761962 +0100
-+++ interface/khronos/common/linux/khrn_client_rpc_linux.c 2015-02-24 
07:02:41.522158412 +0100
-@@ -503,7 +503,8 @@
- void rpc_call8_makecurrent(CLIENT_THREAD_STATE_T *thread, uint32_t id, 
uint32_t p0,
-uint32_t p1, uint32_t p2, uint32_t p3, uint32_t p4, uint32_t p5, uint32_t 
p6, uint32_t p7)
- {
--   if (thread->merge_pos == CLIENT_MAKE_CURRENT_SIZE && *((uint32_t 
*)thread->merge_buffer) == EGLINTMAKECURRENT_ID)
-+   uint32_t data;
-+   if (thread->merge_pos == CLIENT_MAKE_CURRENT_SIZE && 
(memcpy(&data,thread->merge_buffer,sizeof(data)), data == EGLINTMAKECURRENT_ID))
-{
-   rpc_begin(thread);
-   vcos_log_trace("rpc_call8_makecurrent collapse onto previous 
makecurrent");

diff --git a/media-libs/raspberrypi-userland/raspberrypi-userland-.ebuild 
b/media-libs/raspberrypi-userland/raspberrypi-userland-.ebuild
index fc4088c..9c5d675 100644
--- a/media-libs/raspberrypi-userland/raspberrypi-userland-.ebuild
+++ b/media-libs/raspberrypi-userland/raspberrypi-userland-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -23,6 +23,14 @@ src_prepare() {
epatch "${FILESDIR}"/${P}-gentoo.patch
 }
 
+src_configure() {
+   local mycmakeargs=(
+   -DVMCS_INSTALL_PREFIX="/usr"
+   )
+
+   cmake-utils_src_configure
+}
+
 src_install() {
cmake-utils_src_install
 



[gentoo-commits] repo/gentoo:master commit in: media-libs/raspberrypi-userland/files/, media-libs/raspberrypi-userland/

2016-03-10 Thread Miroslav Šulc
commit: 06c415c57f1452d3376499ff82128d9b7013f64a
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Thu Mar 10 14:04:43 2016 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Thu Mar 10 14:04:43 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06c415c5

media-libs/raspberrypi-userland: bug fixes and improvements

fixed bug #539504: support for GLESv1
fixed bugs #499768 and #529424: added pkgconfig files and set environment path 
to these files
fixed location of udev rules file
fixed bug #499768: added support for wayland from leio.git overlay

Package-Manager: portage-2.2.27

 .../files/04raspberrypi-userland   |   2 +-
 media-libs/raspberrypi-userland/files/bcm_host.pc  |  10 +
 media-libs/raspberrypi-userland/files/egl.pc   |  11 ++
 media-libs/raspberrypi-userland/files/glesv2.pc|  11 ++
 .../files/next-resource-handle.patch   | 207 +
 .../raspberrypi-userland/files/wayland-wsys.patch  |   0
 ...> raspberrypi-userland-0_pre20160305-r1.ebuild} |  27 ++-
 7 files changed, 264 insertions(+), 4 deletions(-)

diff --git a/media-libs/raspberrypi-userland/files/04raspberrypi-userland 
b/media-libs/raspberrypi-userland/files/04raspberrypi-userland
index fd37f49..17b493b 100644
--- a/media-libs/raspberrypi-userland/files/04raspberrypi-userland
+++ b/media-libs/raspberrypi-userland/files/04raspberrypi-userland
@@ -1,3 +1,3 @@
-
+PKG_CONFIG_PATH='/opt/vc/lib/pkgconfig'
 PATH='/opt/vc/bin'
 LDPATH='/opt/vc/lib'

diff --git a/media-libs/raspberrypi-userland/files/bcm_host.pc 
b/media-libs/raspberrypi-userland/files/bcm_host.pc
new file mode 100644
index 000..7627ae8
--- /dev/null
+++ b/media-libs/raspberrypi-userland/files/bcm_host.pc
@@ -0,0 +1,10 @@
+prefix=/opt/vc
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: bcm_host
+Description: Broadcom VideoCore host API library
+Version: 1
+Libs: -L${libdir} -lbcm_host -lvcos -lvchiq_arm
+Cflags: -I${includedir} -I${includedir}/interface/vmcs_host/linux 
-I${includedir}/interface/vcos/pthreads -DUSE_VCHIQ_ARM

diff --git a/media-libs/raspberrypi-userland/files/egl.pc 
b/media-libs/raspberrypi-userland/files/egl.pc
new file mode 100644
index 000..56bf1e0
--- /dev/null
+++ b/media-libs/raspberrypi-userland/files/egl.pc
@@ -0,0 +1,11 @@
+prefix=/opt/vc
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: EGL
+Description: Fake EGL package for RPi
+Version: 10
+Requires: bcm_host glesv2
+Libs: -L${libdir} -lEGL
+Cflags: -I${includedir}

diff --git a/media-libs/raspberrypi-userland/files/glesv2.pc 
b/media-libs/raspberrypi-userland/files/glesv2.pc
new file mode 100644
index 000..04d61c2
--- /dev/null
+++ b/media-libs/raspberrypi-userland/files/glesv2.pc
@@ -0,0 +1,11 @@
+prefix=/opt/vc
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: GLESv2
+Description: Fake GL ES 2 package for RPi
+Version: 10
+Requires: bcm_host
+Libs: -L${libdir} -lGLESv2
+Cflags: -I${includedir}

diff --git a/media-libs/raspberrypi-userland/files/next-resource-handle.patch 
b/media-libs/raspberrypi-userland/files/next-resource-handle.patch
new file mode 100644
index 000..45e1a49
--- /dev/null
+++ b/media-libs/raspberrypi-userland/files/next-resource-handle.patch
@@ -0,0 +1,207 @@
+From 825c3236e5908ff003644abd870bfe98e82722b2 Mon Sep 17 00:00:00 2001
+From: Dom Cobley 
+Date: Tue, 9 Jul 2013 09:26:26 -0400
+Subject: [PATCH] Allow applications to set next resource handle
+
+This patch adds provisions in userland to
+let apps callers set the next rendereing dispmanx resource.
+It's useful for implementing, say, a buffer carousel.
+---
+ interface/khronos/common/khrn_client_rpc.h |  2 ++
+ interface/khronos/common/khrn_int_ids.h|  2 ++
+ interface/khronos/egl/egl_client.c | 30 +++---
+ interface/khronos/egl/egl_client_surface.c | 24 +++-
+ interface/khronos/egl/egl_client_surface.h |  3 ++-
+ interface/khronos/egl/egl_int_impl.h   |  5 +++--
+ 6 files changed, 59 insertions(+), 7 deletions(-)
+
+diff --git a/interface/khronos/common/khrn_client_rpc.h 
b/interface/khronos/common/khrn_client_rpc.h
+index 418aa67..a7557a8 100644
+--- a/interface/khronos/common/khrn_client_rpc.h
 b/interface/khronos/common/khrn_client_rpc.h
+@@ -683,6 +683,7 @@ static INLINE void rpc_call18(CLIENT_THREAD_STATE_T 
*thread, uint32_t id, uint32
+ static INLINE void rpc_call13_out_ctrl(CLIENT_THREAD_STATE_T *thread,uint32_t 
id, uint32_t p0, uint32_t p1, uint32_t p2, uint32_t p3, uint32_t p4, uint32_t 
p5, uint32_t p6, uint32_t p7, uint32_t p8, uint32_t p9, uint32_t p10, uint32_t 
p11, void *out)   { rpc_begin(thread); RPC_CALL(thread, id, p0, p1, 
p2, p3, p4, p5, p6, p7, p8, p9, p10, p11);  rpc_recv(thread, out, NULL, 
(RPC_RECV_FLAG_T)(RPC_RECV_FLAG_CTRL | RPC_RECV_FLAG_LEN)); rpc_end(thread); }
+ static INLINE void rpc_call14_

[gentoo-commits] repo/gentoo:master commit in: media-libs/raspberrypi-userland/files/, media-libs/raspberrypi-userland/

2016-03-08 Thread Miroslav Šulc
commit: 761027aca528e7290f964ff4163408c908b7c04e
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Tue Mar  8 23:20:02 2016 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Tue Mar  8 23:20:02 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=761027ac

media-libs/raspberrypi-userland: version bump and fixed regular user access 
rights to vchiq when using udev

Package-Manager: portage-2.2.27

 media-libs/raspberrypi-userland/Manifest   |  1 +
 .../files/92-local-vchiq-permissions.rules |  1 +
 .../raspberrypi-userland-0_pre20160305.ebuild  | 87 ++
 3 files changed, 89 insertions(+)

diff --git a/media-libs/raspberrypi-userland/Manifest 
b/media-libs/raspberrypi-userland/Manifest
index 730152c..b4e59ea 100644
--- a/media-libs/raspberrypi-userland/Manifest
+++ b/media-libs/raspberrypi-userland/Manifest
@@ -2,3 +2,4 @@ DIST raspberrypi-userland-0_pre20130705.tar.xz 31966608 SHA256 
6307cc9d6103cd8af
 DIST raspberrypi-userland-0_pre20140117.tar.xz 31998784 SHA256 
2999d711465ddbc6b70d429a0253b8a9c1f838351a96f2b25cc86109a879005f SHA512 
5c3dfebdcb36a2a17da94cafcc92067b24b454d5694b0bd216dd0d6752c4f505840880094c22125ab5da60f7b53b9114e8d04359a223e9e00be967cb8585e42e
 WHIRLPOOL 
5179758c2be4b45f640eb8759554e19ea4fc8c83e63b0d4396ae84e67ae82e97824bf12f0766df5a70e2ca5b80e90be80e5c9b2eaa968752829765463d3f6d0d
 DIST raspberrypi-userland-0_pre20140830.tar.xz 32066536 SHA256 
f9a06d2ca7d41cdc700b83eeb7c3e06d3ea6bd3fd187880a563144a6bf6ee901 SHA512 
775005177e760fff611d7ce7e4beb466ea111dfc4652b97593d1061b97b1ded32979f8666a0aada6338791abab93bbfd902f267eba5734e8aa932ebcf487
 WHIRLPOOL 
3066272a88b868ef20f27614f6f680aa6eb8a43cd2e281a7a930b99be341b037fa843a1c36bfdc6be619544e5b4b8751e5ab58c853b1baff44894b39284bfa55
 DIST raspberrypi-userland-0_pre20150921.tar.xz 32395092 SHA256 
771bf96111d40c3b86cf2590f22d02306e5f56668f6ee11ace389c719bfccb2b SHA512 
0aad096f5c6d54ef1d494708e80f8fb921e30e0d93ced79b4e939afffa8e824e35347595d6f925d1d7ee86917e72fa0b160ad56c8a4df7711d5e87b5cc399be1
 WHIRLPOOL 
2204dd8f8acf79c3d8baab770e133d18596f00fbf714e9ab46bf4a5ae1a1c0cf9edcbf763bf7fc0403126bb0ca9de7f422a3427dd429d849df6aee1be08b4b6a
+DIST raspberrypi-userland-0_pre20160305.tar.gz 32888927 SHA256 
01cc6dfb5ee50733d58e6cb1ba0f79cb90ab7ef46718c302cbac0fd9e3a09b6a SHA512 
8621f48d699b2736d4a22f03e5cdde6be564b8d2100f46ab85d3f6e0fc958634436fafc8d218f55a114a37acaf6dbe21b5cf2bf57c258a3067af2720d63d0c27
 WHIRLPOOL 
109aabddfc483900741758a737f93c1f3bc4074de2e2f0d25d28a620f8381adb44d21b5fa8eb3f59a69eb3a9903b95b32e3a5d9d9353560d42e37d19aaa9b085

diff --git 
a/media-libs/raspberrypi-userland/files/92-local-vchiq-permissions.rules 
b/media-libs/raspberrypi-userland/files/92-local-vchiq-permissions.rules
new file mode 100644
index 000..bacea0e
--- /dev/null
+++ b/media-libs/raspberrypi-userland/files/92-local-vchiq-permissions.rules
@@ -0,0 +1 @@
+SUBSYSTEM=="vchiq",GROUP="video",MODE="0660"

diff --git 
a/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20160305.ebuild 
b/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20160305.ebuild
new file mode 100644
index 000..5676f12
--- /dev/null
+++ b/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20160305.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils
+
+DESCRIPTION="Raspberry Pi userspace tools and libraries"
+HOMEPAGE="https://github.com/raspberrypi/userland";
+
+if [[ ${PV} == * ]]; then
+   inherit git-2
+   EGIT_REPO_URI="git://github.com/${PN/-//}.git"
+   SRC_URI=""
+   KEYWORDS=""
+else
+   GIT_COMMIT="8369e39"
+   SRC_URI="https://github.com/raspberrypi/userland/tarball/${GIT_COMMIT} 
-> ${P}.tar.gz"
+   KEYWORDS="~arm"
+   S="${WORKDIR}/raspberrypi-userland-${GIT_COMMIT}"
+fi
+
+IUSE="examples"
+LICENSE="BSD"
+SLOT="0"
+
+# TODO:
+# * port vcfiled init script
+# * stuff is still installed to hardcoded /opt/vc location, investigate whether
+#   anything else depends on it being there
+# * live ebuild
+
+src_unpack() {
+   if [[ ${PV} == * ]]; then
+   git-2_src_unpack
+   else
+   default
+   fi
+}
+
+src_prepare() {
+   # init script for Debian, not useful on Gentoo
+   sed -i "/DESTINATION \/etc\/init.d/,+2d" 
interface/vmcs_host/linux/vcfiled/CMakeLists.txt || die
+}
+
+src_install() {
+   cmake-utils_src_install
+
+   doenvd "${FILESDIR}"/04${PN}
+
+   dodir /etc/udev/rules.d
+   insinto /etc/udev/rules.d
+   doins "${FILESDIR}"/92-local-vchiq-permissions.rules
+
+   # enable dynamic switching of the GL implementation
+   dodir /usr/lib/opengl
+   dosym ../../../opt/vc /usr/lib/opengl/${PN}
+
+   # tell eselect opengl that we do not have libGL
+   touch "${ED}"/opt/vc/.gles-only
+
+   # some #include instructions are wrong so we need

[gentoo-commits] repo/gentoo:master commit in: media-libs/raspberrypi-userland/files/

2015-11-29 Thread Alfredo Tupone
commit: 4e3c79b86d0b44b0accb74ed5c769119e67892f8
Author: Tupone Alfredo  gentoo  org>
AuthorDate: Sun Nov 29 17:20:46 2015 +
Commit: Alfredo Tupone  gentoo  org>
CommitDate: Sun Nov 29 17:21:19 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e3c79b8

media-libs/raspberrypi-userland: part of the patch applied upstream

Package-Manager: portage-2.2.20.1

 .../files/raspberrypi-userland--gentoo.patch  | 11 ---
 1 file changed, 11 deletions(-)

diff --git 
a/media-libs/raspberrypi-userland/files/raspberrypi-userland--gentoo.patch 
b/media-libs/raspberrypi-userland/files/raspberrypi-userland--gentoo.patch
index dc74ca0..2c465c7 100644
--- 
a/media-libs/raspberrypi-userland/files/raspberrypi-userland--gentoo.patch
+++ 
b/media-libs/raspberrypi-userland/files/raspberrypi-userland--gentoo.patch
@@ -35,17 +35,6 @@
{
   /* This is a complete echoed packet */
   if (g_params.verify && (mem_check(header->data, 
bulk_tx_data[ctrl_received % NUM_BULK_BUFS], g_params.blocksize) != 0))
 interface/vchiq_arm/CMakeLists.txt.old 2015-02-20 21:23:05.73655 
+0100
-+++ interface/vchiq_arm/CMakeLists.txt 2015-02-20 21:24:11.335832941 +0100
-@@ -3,7 +3,7 @@
- vchiq_lib.c vchiq_util.c)
- 
- # pull in VCHI cond variable emulation
--target_link_libraries(vchiq_arm)
-+target_link_libraries(vchiq_arm vcos)
- 
- install(TARGETS vchiq_arm DESTINATION lib)
- #install(FILES etc/10-vchiq.rules DESTINATION /etc/udev/rules.d)
 --- makefiles/cmake/vmcs.cmake.old 2015-02-21 14:31:57.608527445 +0100
 +++ makefiles/cmake/vmcs.cmake 2015-02-21 14:32:09.358363958 +0100
 @@ -10,7 +10,7 @@