summaryrefslogtreecommitdiff
path: root/media-libs
diff options
context:
space:
mode:
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/Manifest.gzbin69501 -> 69496 bytes
-rw-r--r--media-libs/libjxl/Manifest1
-rw-r--r--media-libs/libjxl/files/libjxl-0.9.1-backport-pr3138.patch46
-rw-r--r--media-libs/mesa/Manifest2
-rw-r--r--media-libs/mesa/mesa-9999.ebuild2
-rw-r--r--media-libs/raspberrypi-userland/Manifest5
-rw-r--r--media-libs/raspberrypi-userland/files/04raspberrypi-userland3
-rw-r--r--media-libs/raspberrypi-userland/files/bcm_host.pc10
-rw-r--r--media-libs/raspberrypi-userland/files/egl.pc11
-rw-r--r--media-libs/raspberrypi-userland/files/glesv2.pc11
-rw-r--r--media-libs/raspberrypi-userland/files/next-resource-handle.patch207
11 files changed, 2 insertions, 296 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 31f2523ff173..06fdbed0ae97 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
Binary files differ
diff --git a/media-libs/libjxl/Manifest b/media-libs/libjxl/Manifest
index 50de8b6184b3..20adcc5184ee 100644
--- a/media-libs/libjxl/Manifest
+++ b/media-libs/libjxl/Manifest
@@ -1,6 +1,5 @@
AUX libjxl-0.8.2-backport-pr2596.patch 2017 BLAKE2B 3155febe7e02fc34dfdf692821028e16f97272f751176ef22126151e8edf18e2c7d9da88d9bc8334cd4737d36037a5a04eb7360a41fde39605db62942c52e62c SHA512 4f8cd6f2a70077b8e52b084a4c76f5a029e3e13e578d28bb2d9d3470ae89fa6867d541bacd079bd55b76eb17a1c2f3d845715fc0d4c9e2a199618d8a6871d1a1
AUX libjxl-0.8.2-backport-pr2617.patch 2853 BLAKE2B edeafa5bfa85f9868d98f4ee38be2dd4a5d747517e6aec59688d5314f1b6ede74bc3d20a11d08e3e2e2e87e8da987730a8a8cafcecce69369fdfa7bcb8ef2828 SHA512 ad8ddbe50d23895a3127d11bf36832ad1a1762e9b54bacc5f4d881accb5c81801618254b9b56afc4b145a7fb19bab8ca739974ff3bcb498e7db812d3a6cf004d
-AUX libjxl-0.9.1-backport-pr3138.patch 1775 BLAKE2B 3bc8ec83f1104fabec0966dffd85719ed6eea5c89a10d7ffc490aaf767815dbfd7c6543a0058664b16a8d52cafb53b3137414403dbb5db844a0ae9366fe4b6bd SHA512 0a9262008daa2d118c4eab85102de8f05b265f3a3a8f45088f28ef844fd7c93740a69aa6a1d93bc5d1808c3158527d8b9b8c4543256c1a2988e8a03bff19486a
AUX libjxl-0.9.1-backport-pr3143.patch 1065 BLAKE2B acc6ab904994f42cffe19296966587dbbf316289277d91e1a17cd635161b51eed770ab95fc682d93b8693d50def9bb205290c3eb534effdfdc2cd057db36647c SHA512 d5eeca764e13175eb64ba5ee47a9bf03080d0830395ba9b626b7144674a5ce8fbb694705a4d2c55f3b52507a59c5793e21e9c99dded65803857a0859a1f9f466
DIST libjxl-0.10.2.tar.gz 1912303 BLAKE2B 9677d0d35d877ce269c9958accfbb5ee55d446dc0e8fa64df9323c1db3993613752803aae63a48c18eeb72ae91c2a044a1fab0a83ddf28fdf8395ddb67a72414 SHA512 1d19f30c0ae94e212326a15dc128612bce207e619c55c2a020401a27d01a933de71bb35e907521dc8fd853dd5578d74d74f7a5a282f0083fd22cf9cb07ccb96e
DIST libjxl-0.8.2.tar.gz 1612062 BLAKE2B 2b5e65cde6c85881c5f26f676afec825c974f6919c3cc3f056ca4a9679162e89f2de35ab7d0b2a60782d39eca1f4ddad779f8d25d3f520417f6d9dea71e854db SHA512 769f102c46755d11a705ce47ae9e2ef49627ae708f416693bf1293aeeb713934baf4466e45b9c70b04ec1fc8b4a00d5ca7688c8ca03f0a91c9a15252c522a887
diff --git a/media-libs/libjxl/files/libjxl-0.9.1-backport-pr3138.patch b/media-libs/libjxl/files/libjxl-0.9.1-backport-pr3138.patch
deleted file mode 100644
index 0da0a9ba8ab8..000000000000
--- a/media-libs/libjxl/files/libjxl-0.9.1-backport-pr3138.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-https://github.com/libjxl/libjxl/issues/3137
-https://github.com/libjxl/libjxl/pull/3138
-
-From 5e5dda47aee0a6f480984cf13cfc2be0044316e4 Mon Sep 17 00:00:00 2001
-From: Moritz Firsching <firsching@google.com>
-Date: Mon, 15 Jan 2024 13:43:01 +0100
-Subject: [PATCH] disable tooling test when not JPEGXL_ENABLE_TOOLS
-
----
- tools/conformance/CMakeLists.txt | 25 ++++++++++++++-----------
- 1 file changed, 14 insertions(+), 11 deletions(-)
-
-diff --git a/tools/conformance/CMakeLists.txt b/tools/conformance/CMakeLists.txt
-index 5766612abf9..36249048c59 100644
---- a/tools/conformance/CMakeLists.txt
-+++ b/tools/conformance/CMakeLists.txt
-@@ -4,15 +4,18 @@
- # license that can be found in the LICENSE file.
-
- if(BUILD_TESTING AND CMAKE_EXECUTABLE_SUFFIX STREQUAL "")
--# Script to validate the tooling.
--find_program (BASH_PROGRAM bash)
--if(BASH_PROGRAM)
-- add_test(
-- NAME conformance_tooling_test
-- COMMAND
-- ${BASH_PROGRAM} ${CMAKE_CURRENT_SOURCE_DIR}/tooling_test.sh
-- ${CMAKE_BINARY_DIR} ${JPEGXL_TEST_DATA_PATH})
-- # Skip the test if dependencies are not available.
-- set_tests_properties(conformance_tooling_test PROPERTIES SKIP_RETURN_CODE 254)
--endif()
-+ # Script to validate the tooling.
-+ # Only add it when djxl being build.
-+ if(JPEGXL_ENABLE_TOOLS)
-+ find_program (BASH_PROGRAM bash)
-+ if(BASH_PROGRAM)
-+ add_test(
-+ NAME conformance_tooling_test
-+ COMMAND
-+ ${BASH_PROGRAM} ${CMAKE_CURRENT_SOURCE_DIR}/tooling_test.sh
-+ ${CMAKE_BINARY_DIR} ${JPEGXL_TEST_DATA_PATH})
-+ # Skip the test if dependencies are not available.
-+ set_tests_properties(conformance_tooling_test PROPERTIES SKIP_RETURN_CODE 254)
-+ endif() # BASH_PROGRAM
-+ endif() # JPEGXL_ENABLE_TOOLS
- endif() # BUILD_TESTING
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 1b0a439ca412..e283a5b63fec 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -3,5 +3,5 @@ DIST mesa-24.0.4.tar.xz 20057744 BLAKE2B 6de755081f7e9dd9303af791e1a405203388787
DIST mesa-24.0.5.tar.xz 20096384 BLAKE2B c4c5f493206f761a7171f19c6549dc791559a1fdbcf49aea98016f98c10f9130081a16df6b780062621495a42dc49ef5f0800bda64058e8ba60106f6a046ccef SHA512 9476af4b9ac8db5dce397084ef169927d10b28adea7e74aa5b3136810b499ac98ddf7ab564e7d1ff81c887208c8ebab3ad2d4e27e7f46136609b5c67527018eb
EBUILD mesa-24.0.4.ebuild 11622 BLAKE2B 21b8abb688e9ebb187ecc7a961ce851a83c5b09c58d3a51a3dd1151e927322c85a8ab44c5f6108dd4d02ca665eccdb2ade4d1604abe78c48eaee747b82c37329 SHA512 9eea957f1ec9db156c8fd9210214b566991524d3422fb411ec3758088b9851f8499e28c7284911f153ab64e1ec25088bf9b6485e2a7b406950edea9a0557c43a
EBUILD mesa-24.0.5.ebuild 11630 BLAKE2B 4c0b8bee298f59954db6759e92464530c0fd7684425ebbbd4985e0d7f87e004f1c0990ec5468266ee9773833fc00f6287ef162d9abaca1ebeb553fe0d26bc19f SHA512 0854e76a64cc3bb2bcd873805a1c92a46bb82cbba2a107cfd43af676da0eab5b755646155164182dedd8a3dc26a6b73a11e8c366ba8067e142b49ac6d48ec4f4
-EBUILD mesa-9999.ebuild 11440 BLAKE2B 30dae1ddaf02fc912792b4ed84226b5403ad0519267a7849e5ce39915ee3c0020cf71f84351e26d278319f578a71ddb559152937c845e703c2e256c4fff8ed16 SHA512 a3117f30efce1d231a9b541c619df2973a85ff05ee0afea41e611161b0403b5679f5c09843077005152f6316498021a0555a43109fd5bdde9d5d6126820d90bd
+EBUILD mesa-9999.ebuild 11440 BLAKE2B d15749e785f0e13a662f889803d71466185d905205a077d730ea8df71d2936d6035b76c670e8ff20834df5d2f9a09d220bbc7ae8505ed8ef6aa837cf9caf2004 SHA512 9fbde7f466ef10a8a453fc1e3d5fc0f254031aa1c484519e5c9b79279f9c8b692f605c25902d5b3ffa1981ff26e74b213cab0b2c6e97383542de2d49c810f827
MISC metadata.xml 1435 BLAKE2B 53690878512b86ce0b8dce38b083684c85ad5c1a655d5a69cb3265e156869845263eb16f271691b66c9f0cd76e97b56908acf7a1792d6abac0ec99447826cbb5 SHA512 842106e5d6eb60ff33c8cae7f0d52983c4f7e104152718b50fc790cbcb2506551a6fc7841fe8e3c7963850c238f77505b0e49b10a3a936baf459e1acaf73e07f
diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 98fed4a9ad0e..1b84a142e107 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -102,7 +102,7 @@ RDEPEND="
>=x11-libs/libxshmfence-1.1[${MULTILIB_USEDEP}]
>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
>=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}]
- >=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
+ >=x11-libs/libxcb-1.17:=[${MULTILIB_USEDEP}]
x11-libs/libXfixes[${MULTILIB_USEDEP}]
x11-libs/xcb-util-keysyms[${MULTILIB_USEDEP}]
)
diff --git a/media-libs/raspberrypi-userland/Manifest b/media-libs/raspberrypi-userland/Manifest
index a1829b5a312f..0f9d08c2c3fe 100644
--- a/media-libs/raspberrypi-userland/Manifest
+++ b/media-libs/raspberrypi-userland/Manifest
@@ -1,9 +1,4 @@
-AUX 04raspberrypi-userland 80 BLAKE2B cf3b819e4cd50f50b9efaf95c654567f607e0bc36e341ec705ebe449f99817bbb39d166013e60de8705024cb6f56cb6ba18e33f4417c5607a058147f7777cc1b SHA512 fc934a7aa367dcd787c9158d07f59866b8e04034928303a949b2c4fa45577afcc0b31c5a3e7b08defcfc040e601a51728fc5ccd9a6c0dd60e2c1cb2fd00107d9
AUX 92-local-vchiq-permissions.rules 142 BLAKE2B 962d9eb744717cf7a685fb7ab8a0e68f964a3ca7c0d49d2b93102d66bb3d20d84a433097fc7b510f609b8b762ae0f7ede32954b9c2ec055d5dbaa4d07b06af81 SHA512 b0e430adf65ccde1c3199c59e876293ffa1821a70f7d60057bb4990108fe21604e6d8c11dbdd74de50ad1fd5fad5e579ad35fb172a62ccef26bd2ff9bed5aba4
-AUX bcm_host.pc 338 BLAKE2B 2afdd23a6b200a04650c4ea0b669b14e4f6aac9f2fbcbc77a606615cd17b9a4651b4bba8d367ea7dfc1366873cdc9aef41baae5723f610b462ee58fbc3e3e7cc SHA512 d13ebe21288fc8cb29643a3564415006899490334c8a2d4601632d5a7b681e1f1ee97cc7b8d6b8840b28432dc8dd0b090e0c592dc07c99e3cc72ad9fbce0933b
-AUX egl.pc 227 BLAKE2B e3b205358a0891f58d95fbd0494e6d6a07c550363b60373c0f3b14686b5c3967dfa7e76fb2a65ca703c770f7bd9e5ba2232e1932ebebdd799fb99555afa55402 SHA512 15e2cdf73be35640a951a7e841963902bb056d96025b52c1551359ec7671baf710699c642a08a5543d52d27f424d900e2fd1d584976a056a54a20116b59a21f6
-AUX glesv2.pc 230 BLAKE2B eb3405f7e867b7e8d1ecde9498ac396c11931dac0bb03ae1e78a3bb6ed376b468917ed6363f08341934f1b97ed3df00bfc9c0af22e6e5aa7c91def517df586e7 SHA512 a821afcf22d52ea48b4b94b3f4317553bed2ed2e1aadee2862b4d925ee3c78cc0d3a023c62842758de5c2b168dfc8b1ba6838ccb9b0749aef9fc782aa33fa8ec
-AUX next-resource-handle.patch 12535 BLAKE2B b7dbf4152f92ce7bbbf9d2b8b72fddc8cf2f32e576b2d8096b0b17ac89a4cc8ab2cfd0e11137b8da3b2c7b7414d02855a14e1dbffd77d26e087989184ab88001 SHA512 f0368ffff54f989f2541f1891fe3b244d9ff4f2fc464adf2387c04045aca2f1e1f35622d2bd6c6d42e9581c45c417d1961e235b063d892b17e7dbe3e4724f5c5
AUX raspberrypi-userland-include.patch 1484 BLAKE2B 7563874b54b168bd4858ecb65112ef48a7e010feae7a68c22f6d3f47dc1b855222df124df808fd6be427fea5763a9afd4c55ae2e3223c7bd55aa95333e55fe88 SHA512 fe73bcd1182b36e8ccaf81f0d7717f299a482545f08b352af8ead80f134a7be0f5269adb6972a1979a390046b9b94cab55c7a50a493740c72c5084e0e4995baf
AUX raspberrypi-userland-libdir.patch 12348 BLAKE2B ed0dcc454b13589244204cf2cb26d9e38b75887c2d4d1ec4db02e7d4a206661f0ae4fc9d06467e353310a6b69f49a72a53b2882acab6a3959d57c7c0d34434b5 SHA512 213f04d859a0134143cf0e98650ed69096934c1600577d28bb24d62272f9da7ca12d0f3b59a19d3ff06a5fc67547f8e5a8684738b534bfa6e429722b320fee9f
AUX raspberrypi-userland-libfdt-static.patch 724 BLAKE2B 1e2901c69d9bf855c1db9e7f5776041d9d83e9e3025a31ab54fa136bfd67dd944ed631017de33ef15a948324b1392711fb2535b65fea4e4d5a59177b866114ea SHA512 1841061596a98157d7ed25f358e5d63d78f7f808f777b909c271c0b4aa9b45c4dfa498d5623bc53466d9b81e5c064ae45423910d180816b7e39563cedb1809d8
diff --git a/media-libs/raspberrypi-userland/files/04raspberrypi-userland b/media-libs/raspberrypi-userland/files/04raspberrypi-userland
deleted file mode 100644
index 17b493b1814e..000000000000
--- 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 7627ae87105b..000000000000
--- 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 56bf1e07e93b..000000000000
--- 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 04d61c21cea3..000000000000
--- 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 45e1a494b2c8..000000000000
--- 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 <dc4@broadcom.com>
-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, uint32_t p9, uint32_t p10, uint32_t p11, uint32_t p12, void *out) { rpc_begin(thread); RPC_CALL(thread, id, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12); rpc_recv(thread, out, NULL, (RPC_RECV_FLAG_T)(RPC_RECV_FLAG_CTRL | RPC_RECV_FLAG_LEN)); rpc_end(thread); }
- static INLINE void rpc_call15_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, uint32_t p12, uint32_t p13, void *out) { rpc_begin(thread); RPC_CALL(thread, id, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13); rpc_recv(thread, out, NULL, (RPC_RECV_FLAG_T)(RPC_RECV_FLAG_CTRL | RPC_RECV_FLAG_LEN)); rpc_end(thread); }
-+static INLINE void rpc_call16_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, uint32_t p12, uint32_t p13, uint32_t p14, void *out) { rpc_begin(thread); RPC_CALL(thread, id, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14); rpc_recv(thread, out, NULL, (RPC_RECV_FLAG_T)(RPC_RECV_FLAG_CTRL | RPC_RECV_FLAG_LEN)); rpc_end(thread); }
- #endif
-
- #define RPC_CALL1_OUT_CTRL(fn, thread, id, out) rpc_call1_out_ctrl(thread, id, out)
-@@ -700,6 +701,7 @@ static INLINE void rpc_call18(CLIENT_THREAD_STATE_T *thread, uint32_t id, uint32
- #define RPC_CALL13_OUT_CTRL(fn, thread, id, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, out) rpc_call13_out_ctrl(thread, id, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, out)
- #define RPC_CALL14_OUT_CTRL(fn, thread, id, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, out) rpc_call14_out_ctrl(thread, id, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, out)
- #define RPC_CALL15_OUT_CTRL(fn, thread, id, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, out) rpc_call15_out_ctrl(thread, id, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, out)
-+#define RPC_CALL16_OUT_CTRL(fn, thread, id, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, out) rpc_call16_out_ctrl(thread, id, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, out)
-
- # if !defined(__SYMBIAN32__) //use functions defined in khrpc.cpp
- static INLINE uint32_t rpc_call1_out_ctrl_res(CLIENT_THREAD_STATE_T *thread,uint32_t id, void *out) { uint32_t res; rpc_begin(thread); RPC_CALL(thread, id); res = rpc_recv(thread, out, NULL, (RPC_RECV_FLAG_T)(RPC_RECV_FLAG_RES | RPC_RECV_FLAG_CTRL | RPC_RECV_FLAG_LEN)); rpc_end(thread); return res; }
-diff --git a/interface/khronos/common/khrn_int_ids.h b/interface/khronos/common/khrn_int_ids.h
-index 8378f4a..ec961e0 100644
---- a/interface/khronos/common/khrn_int_ids.h
-+++ b/interface/khronos/common/khrn_int_ids.h
-@@ -367,6 +367,7 @@
- */
-
- #define EGLINTCREATESURFACE_ID 0x4000
-+#define EGLINTCREATESURFACE_ID_V2 0x4100
- #define EGLINTCREATEGLES11_ID 0x4001
- #define EGLINTCREATEGLES20_ID 0x4002
- #define EGLINTCREATEVG_ID 0x4003
-@@ -377,6 +378,7 @@
- #define EGLINTMAKECURRENT_ID 0x4008
- #define EGLINTFLUSHANDWAIT_ID 0x4009
- #define EGLINTSWAPBUFFERS_ID 0x400a
-+#define EGLINTSWAPBUFFERS_ID_V2 0x410a
- #define EGLINTSELECTMIPMAP_ID 0x400b
- #define EGLINTFLUSH_ID 0x400c
- #define EGLINTGETCOLORDATA_ID 0x400d
-diff --git a/interface/khronos/egl/egl_client.c b/interface/khronos/egl/egl_client.c
-index fd07eb6..e902d19 100644
---- a/interface/khronos/egl/egl_client.c
-+++ b/interface/khronos/egl/egl_client.c
-@@ -162,6 +162,17 @@
- void egl_gl_flush_callback(bool wait);
- void egl_vg_flush_callback(bool wait);
-
-+#include "interface/vmcs_host/vc_dispmanx_types.h"
-+/**HACKHACK - give us the ability to inject a DispmanX
-+ * resource handle into the CreateWindowSurface and
-+ * SwapBuffers calls */
-+static DISPMANX_RESOURCE_HANDLE_T next_resource_handle;
-+
-+EGLAPI EGLBoolean EGLAPIENTRY eglSetNextResourceHandle(DISPMANX_RESOURCE_HANDLE_T handle)
-+{
-+ next_resource_handle = handle;
-+}
-+
- /*
- TODO: do an RPC call to make sure the Khronos vll is loaded (and that it stays loaded until eglTerminate)
- Also affects global image (and possibly others?)
-@@ -643,7 +654,8 @@ EGLAPI EGLSurface EGLAPIENTRY eglCreateWindowSurface(EGLDisplay dpy, EGLConfig c
- false,
- EGL_NO_TEXTURE,
- EGL_NO_TEXTURE,
-- 0, 0);
-+ 0, 0,
-+ next_resource_handle);
-
- if (surface) {
- if (khrn_pointer_map_insert(&process->surfaces, process->next_surface, surface)) {
-@@ -888,7 +900,7 @@ EGLAPI EGLSurface EGLAPIENTRY eglCreatePbufferSurface(EGLDisplay dpy, EGLConfig
- mipmap_texture,
- texture_format,
- texture_target,
-- 0, 0);
-+ 0, 0, 0);
-
- if (surface) {
- if (khrn_pointer_map_insert(&process->surfaces, process->next_surface, surface)) {
-@@ -1030,7 +1042,7 @@ EGLAPI EGLSurface EGLAPIENTRY eglCreatePixmapSurface(EGLDisplay dpy, EGLConfig c
- false,
- EGL_NO_TEXTURE,
- EGL_NO_TEXTURE,
-- pixmap, ((server_handle[0] == 0) && (server_handle[1] == (uint32_t)(-1))) ? NULL : server_handle);
-+ pixmap, ((server_handle[0] == 0) && (server_handle[1] == (uint32_t)(-1))) ? NULL : server_handle, 0);
-
- if (surface) {
- if (khrn_pointer_map_insert(&process->surfaces, process->next_surface, surface)) {
-@@ -2302,6 +2314,18 @@ EGLAPI EGLBoolean EGLAPIENTRY eglSwapBuffers(EGLDisplay dpy, EGLSurface surf)
-
- vcos_log_trace("eglSwapBuffers server call");
-
-+ if (next_resource_handle)
-+ RPC_CALL7(eglIntSwapBuffers_impl,
-+ thread,
-+ EGLINTSWAPBUFFERS_ID_V2,
-+ RPC_UINT(surface->serverbuffer),
-+ RPC_UINT(surface->width),
-+ RPC_UINT(surface->height),
-+ RPC_UINT(surface->internal_handle),
-+ RPC_UINT(surface->swap_behavior == EGL_BUFFER_PRESERVED ? 1 : 0),
-+ RPC_UINT(khrn_platform_get_window_position(surface->win)),
-+ RPC_INT(next_resource_handle));
-+ else
- RPC_CALL6(eglIntSwapBuffers_impl,
- thread,
- EGLINTSWAPBUFFERS_ID,
-diff --git a/interface/khronos/egl/egl_client_surface.c b/interface/khronos/egl/egl_client_surface.c
-index cda5943..0be56c5 100644
---- a/interface/khronos/egl/egl_client_surface.c
-+++ b/interface/khronos/egl/egl_client_surface.c
-@@ -314,7 +314,8 @@ EGL_SURFACE_T *egl_surface_create(
- EGLenum texture_format,
- EGLenum texture_target,
- EGLNativePixmapType pixmap,
-- const uint32_t *pixmap_server_handle)
-+ const uint32_t *pixmap_server_handle,
-+ DISPMANX_RESOURCE_HANDLE_T next_resource_handle)
- {
- KHRN_IMAGE_FORMAT_T color;
- KHRN_IMAGE_FORMAT_T depth;
-@@ -473,6 +474,27 @@ EGL_SURFACE_T *egl_surface_create(
- #endif
- uint32_t results[3];
-
-+ if (next_resource_handle)
-+ RPC_CALL16_OUT_CTRL(eglIntCreateSurface_impl,
-+ thread,
-+ EGLINTCREATESURFACE_ID_V2,
-+ RPC_UINT(serverwin),
-+ RPC_UINT(buffers),
-+ RPC_UINT(width),
-+ RPC_UINT(height),
-+ RPC_UINT(color),
-+ RPC_UINT(depth),
-+ RPC_UINT(mask),
-+ RPC_UINT(multi),
-+ RPC_UINT(largest_pbuffer),
-+ RPC_UINT(mipmap_texture),
-+ RPC_UINT(config_depth_bits),
-+ RPC_UINT(config_stencil_bits),
-+ RPC_UINT(sem_name),
-+ RPC_UINT(type),
-+ RPC_INT(next_resource_handle),
-+ results);
-+ else
- RPC_CALL15_OUT_CTRL(eglIntCreateSurface_impl,
- thread,
- EGLINTCREATESURFACE_ID,
-diff --git a/interface/khronos/egl/egl_client_surface.h b/interface/khronos/egl/egl_client_surface.h
-index c99d44c..b5bf70a 100644
---- a/interface/khronos/egl/egl_client_surface.h
-+++ b/interface/khronos/egl/egl_client_surface.h
-@@ -322,7 +322,8 @@ extern EGL_SURFACE_T *egl_surface_create(
- EGLenum texture_format,
- EGLenum texture_target,
- EGLNativePixmapType pixmap,
-- const uint32_t *pixmap_server_handle);
-+ const uint32_t *pixmap_server_handle,
-+ DISPMANX_RESOURCE_HANDLE_T next_resource_handle);
- extern EGL_SURFACE_T *egl_surface_from_vg_image(
- VGImage vg_handle,
- EGLSurface name,
-diff --git a/interface/khronos/egl/egl_int_impl.h b/interface/khronos/egl/egl_int_impl.h
-index 8a5734c..51b3580 100644
---- a/interface/khronos/egl/egl_int_impl.h
-+++ b/interface/khronos/egl/egl_int_impl.h
-@@ -56,7 +56,8 @@
- uint32_t config_stencil_bits,
- uint32_t sem,
- uint32_t type,
-- uint32_t *results))
-+ uint32_t *results,
-+ DISPMANX_RESOURCE_HANDLE_T next_resource_handle))
-
- FN(int, eglIntCreatePbufferFromVGImage_impl, (
- VGImage vg_handle,
-@@ -110,7 +111,7 @@
- FN(int, eglIntFlushAndWait_impl, (uint32_t flushgl, uint32_t flushvg))
- FN(void, eglIntFlush_impl, (uint32_t flushgl, uint32_t flushvg))
-
--FN(void, eglIntSwapBuffers_impl, (EGL_SURFACE_ID_T s, uint32_t width, uint32_t height, uint32_t handle, uint32_t preserve, uint32_t position))
-+FN(void, eglIntSwapBuffers_impl, (EGL_SURFACE_ID_T s, uint32_t width, uint32_t height, uint32_t handle, uint32_t preserve, uint32_t position, DISPMANX_RESOURCE_HANDLE_T new_back_buffer))
- FN(void, eglIntSelectMipmap_impl, (EGL_SURFACE_ID_T s, int level))
-
- FN(void, eglIntGetColorData_impl, (EGL_SURFACE_ID_T s, KHRN_IMAGE_FORMAT_T format, uint32_t width, uint32_t height, int32_t stride, uint32_t y_offset, void *data))
---
-1.8.5.1
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-05 03:14:24 +0000