pktsurf/smlinux
1
1
Fork 0
Code Issues 1 Pull requests Wiki Activity

Removed legacy package xorg/libomxil-bellagio and updated build list

Browse source 
Upgraded xorg/libdrm to 2.4.115
Upgraded xorg/mesa to 22.3.6
Upgraded xorg/xorg-server to 1.20.14
This commit is contained in:
PktSurf 2023-03-05 21:07:44 +05:30
parent 33a6695eca
commit 257c78c34d
6 changed files with 16 additions and 268 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
xorg/.buildlist.xorg
View file

@ -116,7 +116,5 @@ libraw
dconf
spandsp
xdg-dbus-proxy
libomxil-bellagio
font-util
xorg-fonts
udisks

8
xorg/libdrm/libdrm.SMBuild
View file

@ -1,5 +1,5 @@
app=libdrm
version=2.4.102
version=2.4.115
build=1sml
homepage="https://dri.freedesktop.org/"
download="https://dri.freedesktop.org/libdrm/libdrm-$version.tar.xz"
@ -17,7 +17,7 @@ build() {
mkdir -p smbuild && cd smbuild
meson .. \
--prefix="/" \
-Dcairo-tests=false
-Dcairo-tests=disabled
ninja
DESTDIR="$pkg" ninja install
@ -28,5 +28,5 @@ build() {
}
sha512sums="
79df0883e03ddac41585914f3478a4557ecb128b918862d9c634f5934ea84682b5e862f961a55616686da9d6026bb59c2d367738ca312f8984b46a4d544ad0e2 libdrm-2.4.102.tar.lz
"
ef97ef5a9a6366f7a85bc67d826416c3156c24f6b034a3790076d97942cef1d9d9671e264d556afa9d94cd1e9deebe66ed4979c3aee7e79f6b6ee2d3ead43628 libdrm-2.4.115.tar.lz
"

199
xorg/libomxil-bellagio/fedora-fixes.patch
View file

@ -1,199 +0,0 @@
When libomxdynamicloader.so is loaded, it complains that RM_Deinit can't be resolved.
Link explicitly against omxil-bellagio so that ld.so can find the reference.
Signed-off-by: Qais Yousef <qais.yousef@imgtec.com>
--- bellagio-0.9.3/src/dynamic_loader/Makefile.am.old 2012-03-23 15:07:47.379021034 +0000
+++ bellagio-0.9.3/src/dynamic_loader/Makefile.am 2012-03-23 15:08:47.563034818 +0000
@@ -3,7 +3,7 @@
omxdynamicloader_LTLIBRARIES = libomxdynamicloader.la
libomxdynamicloader_la_SOURCES = ste_dynamic_component_loader.c ste_dynamic_component_loader.h
-libomxdynamicloader_la_LDFLAGS =
+libomxdynamicloader_la_LDFLAGS = -L$(abs_top_srcdir)/src/.libs -lomxil-bellagio
libomxdynamicloader_la_CFLAGS = -I$(top_srcdir)/include \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/base \
Fix dependency issue to allow parallel build
Signed-off-by: Qais Yousef <qais.yousef@imgtec.com>
Index: bellagio-0.9.3/src/Makefile.am
===================================================================
--- bellagio-0.9.3.orig/src/Makefile.am
+++ bellagio-0.9.3/src/Makefile.am
@@ -8,6 +8,7 @@ omxregister_bellagio_SOURCES = omxregist
omxregister_bellagio_CFLAGS = -DOMXILCOMPONENTSPATH=\"$(plugindir)/\" \
-I$(top_srcdir)/include
omxregister_bellagio_LDFLAGS = -lomxil-bellagio -L$(builddir)
+omxregister_bellagio_DEPENDENCIES = libomxil-bellagio.la
lib_LTLIBRARIES = libomxil-bellagio.la
libomxil_bellagio_la_SOURCES = component_loader.h \
We always access globalComponentList[] at indexComponent=-1 which causes a
segfault. Use i as the index instead.
Signed-off-by: Qais Yousef <qais.yousef@imgtec.com>
--- bellagio-0.9.3/src/omx_reference_resource_manager.c.old 2012-03-13 10:15:25.743940980 +0000
+++ bellagio-0.9.3/src/omx_reference_resource_manager.c 2012-03-13 10:18:02.201971009 +0000
@@ -485,7 +485,6 @@
OMX_ERRORTYPE RM_removeFromWaitForResource(OMX_COMPONENTTYPE *openmaxStandComp) {
omx_base_component_PrivateType* omx_base_component_Private;
int i = 0;
- int indexComponent = -1;
DEBUG(DEB_LEV_FUNCTION_NAME, "In %s\n", __func__);
omx_base_component_Private = (omx_base_component_PrivateType*)openmaxStandComp->pComponentPrivate;
@@ -493,16 +492,13 @@
while(listOfcomponentRegistered[i].component_name != NULL ) {
if (!strcmp(listOfcomponentRegistered[i].component_name, omx_base_component_Private->name)) {
// found component in the list of the resource manager
- removeElemFromList(&globalComponentList[indexComponent], openmaxStandComp);
- break;
+ removeElemFromList(&globalComponentList[i], openmaxStandComp);
+ DEBUG(DEB_LEV_FUNCTION_NAME, "Out of %s\n", __func__);
+ return OMX_ErrorNone;
}
i++;
}
- if (indexComponent <0) {
- // No resource to be handled
- DEBUG(DEB_LEV_ERR, "In %s No resource to be handled\n", __func__);
- return OMX_ErrorNone;
- }
- DEBUG(DEB_LEV_FUNCTION_NAME, "Out of %s\n", __func__);
+ // No resource to be handled
+ DEBUG(DEB_LEV_ERR, "In %s No resource to be handled\n", __func__);
return OMX_ErrorNone;
}
OMX_INDEXTYPE/OMX_INDEXVENDORTYPE in one switch
src/base/omx_base_component.c | 54 ++++++++++++++++++++++-------------------
1 files changed, 29 insertions(+), 25 deletions(-)
--- a/src/base/omx_base_component.c
+++ a/src/base/omx_base_component.c
@@ -915,14 +915,6 @@ OSCL_EXPORT_REF OSCL_EXPORT_REF OMX_ERRORTYPE omx_base_component_GetParameter(
return OMX_ErrorBadParameter;
}
switch(nParamIndex) {
- case OMX_IndexParameterThreadsID:
- if ((err = checkHeader(ComponentParameterStructure, sizeof(OMX_PARAM_BELLAGIOTHREADS_ID))) != OMX_ErrorNone) {
- break;
- }
- threadID = (OMX_PARAM_BELLAGIOTHREADS_ID *)ComponentParameterStructure;
- threadID->nThreadBufferMngtID = omx_base_component_Private->bellagioThreads->nThreadBufferMngtID;
- threadID->nThreadMessageID = omx_base_component_Private->bellagioThreads->nThreadMessageID;
- break;
case OMX_IndexParamAudioInit:
case OMX_IndexParamVideoInit:
case OMX_IndexParamImageInit:
@@ -988,28 +980,40 @@ OSCL_EXPORT_REF OSCL_EXPORT_REF OMX_ERRORTYPE omx_base_component_GetParameter(
}
}
break;
- case OMX_IndexVendorCompPropTunnelFlags:
- pPropTunnelSetup = (OMX_VENDOR_PROP_TUNNELSETUPTYPE*)ComponentParameterStructure;
+ default:
+ /* additional switch statement for extended OMX_INDEXTYPE */
+ switch((OMX_INDEXVENDORTYPE) nParamIndex) {
+ case OMX_IndexParameterThreadsID:
+ if ((err = checkHeader(ComponentParameterStructure, sizeof(OMX_PARAM_BELLAGIOTHREADS_ID))) != OMX_ErrorNone) {
+ break;
+ }
+ threadID = (OMX_PARAM_BELLAGIOTHREADS_ID *)ComponentParameterStructure;
+ threadID->nThreadBufferMngtID = omx_base_component_Private->bellagioThreads->nThreadBufferMngtID;
+ threadID->nThreadMessageID = omx_base_component_Private->bellagioThreads->nThreadMessageID;
+ break;
+ case OMX_IndexVendorCompPropTunnelFlags:
+ pPropTunnelSetup = (OMX_VENDOR_PROP_TUNNELSETUPTYPE*)ComponentParameterStructure;
- if (pPropTunnelSetup->nPortIndex >= (omx_base_component_Private->sPortTypesParam[OMX_PortDomainAudio].nPorts +
- omx_base_component_Private->sPortTypesParam[OMX_PortDomainVideo].nPorts +
- omx_base_component_Private->sPortTypesParam[OMX_PortDomainImage].nPorts +
- omx_base_component_Private->sPortTypesParam[OMX_PortDomainOther].nPorts)) {
+ if (pPropTunnelSetup->nPortIndex >= (omx_base_component_Private->sPortTypesParam[OMX_PortDomainAudio].nPorts +
+ omx_base_component_Private->sPortTypesParam[OMX_PortDomainVideo].nPorts +
+ omx_base_component_Private->sPortTypesParam[OMX_PortDomainImage].nPorts +
+ omx_base_component_Private->sPortTypesParam[OMX_PortDomainOther].nPorts)) {
- DEBUG(DEB_LEV_ERR,"In %s OMX_IndexVendorCompPropTunnelFlags nPortIndex=%d Line=%d \n",
- __func__,(int)pPropTunnelSetup->nPortIndex,__LINE__);
+ DEBUG(DEB_LEV_ERR,"In %s OMX_IndexVendorCompPropTunnelFlags nPortIndex=%d Line=%d \n",
+ __func__,(int)pPropTunnelSetup->nPortIndex,__LINE__);
- return OMX_ErrorBadPortIndex;
- }
+ return OMX_ErrorBadPortIndex;
+ }
- pPort = omx_base_component_Private->ports[pPropTunnelSetup->nPortIndex];
+ pPort = omx_base_component_Private->ports[pPropTunnelSetup->nPortIndex];
- pPropTunnelSetup->nTunnelSetup.nTunnelFlags = pPort->nTunnelFlags;
- pPropTunnelSetup->nTunnelSetup.eSupplier = pPort->eBufferSupplier;
- break;
- default:
- err = OMX_ErrorUnsupportedIndex;
- break;
+ pPropTunnelSetup->nTunnelSetup.nTunnelFlags = pPort->nTunnelFlags;
+ pPropTunnelSetup->nTunnelSetup.eSupplier = pPort->eBufferSupplier;
+ break;
+ default:
+ err = OMX_ErrorUnsupportedIndex;
+ break;
+ }
}
DEBUG(DEB_LEV_FUNCTION_NAME, "Out of %s for component %p\n", __func__, hComponent);
return err;
diff -up libomxil-bellagio-0.9.3/Makefile.am.nodoc libomxil-bellagio-0.9.3/Makefile.am
--- libomxil-bellagio-0.9.3/Makefile.am.nodoc 2011-01-12 08:53:26.000000000 +0100
+++ libomxil-bellagio-0.9.3/Makefile.am 2012-04-23 13:46:15.410823381 +0200
@@ -7,7 +7,6 @@ EXTRA_DIST = libomxil-bellagio.spec
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libomxil-bellagio.pc
-docdir = $(DESTDIR)$(prefix)/share/doc/@PACKAGE@
doc_DATA = README \
ChangeLog \
TODO
diff -up libomxil-bellagio-0.9.3/src/omxregister.c.unused libomxil-bellagio-0.9.3/src/omxregister.c
--- libomxil-bellagio-0.9.3/src/omxregister.c.unused 2011-01-12 08:53:26.000000000 +0100
+++ libomxil-bellagio-0.9.3/src/omxregister.c 2012-12-10 22:02:28.621695659 +0100
@@ -248,7 +248,15 @@ static int buildComponentsList(FILE* omx
}
fptr(stComponents);
err = fwrite(lib_absolute_path, 1, strlen(lib_absolute_path), omxregistryfp);
- err = fwrite("\n", 1, 1, omxregistryfp);
+ if (err != strlen(lib_absolute_path)) {
+ DEBUG(DEB_LEV_ERR, "Failed to write %zu bytes to fd %d\n", strlen(lib_absolute_path), fileno(omxregistryfp));
+ continue;
+ }
+ err = fwrite("\n", 1, strlen(buffer), omxregistryfp);
+ if (err != strlen(buffer)) {
+ DEBUG(DEB_LEV_ERR, "Failed to write %zu bytes to fd %d\n", strlen(buffer), fileno(omxregistryfp));
+ continue;
+ }
for (i = 0; i<num_of_comp; i++) {
--- libomxil-bellagio-0.9.3/include/OMX_Types.h.orig 2011-01-12 08:53:26.000000000 +0100
+++ libomxil-bellagio-0.9.3/include/OMX_Types.h 2013-02-25 09:53:55.000000000 +0100
@@ -314,6 +314,18 @@
* platform & operating specific object used to reference the window */
typedef void* OMX_NATIVE_WINDOWTYPE;
+
+/** Define the OMX IL version that corresponds to this set of header files.
+ * We also define a combined version that can be used to write or compare
+ * values of the 32bit nVersion field, assuming a little endian architecture */
+#define OMX_VERSION_MAJOR 1
+#define OMX_VERSION_MINOR 1
+#define OMX_VERSION_REVISION 2
+#define OMX_VERSION_STEP 0
+
+#define OMX_VERSION ((OMX_VERSION_STEP<<24) | (OMX_VERSION_REVISION<<16) | (OMX_VERSION_MINOR<<8) | OMX_VERSION_MAJOR)
+
+
/** The OMX_VERSIONTYPE union is used to specify the version for
a structure or component. For a component, the version is entirely
specified by the component vendor. Components doing the same function

40
xorg/libomxil-bellagio/libomxil-bellagio.SMBuild
View file

@ -1,40 +0,0 @@
app=libomxil-bellagio
version=0.9.3
build=1sml
homepage="http://omxil.sourceforge.net/"
download="http://sourceforge.net/projects/omxil/files/omxil/Bellagio%20$version/libomxil-bellagio-$version.tar.gz"
desc="opensource implementation of the OpenMAX Integration Layer API"
requires="musl"
build() {
compileonlyfor aarch64
mkandenterbuilddir
rm -rf $app-$version
tar xf $srcdir/$app-$version.tar.?z*
cd $app-$version
fixbuilddirpermissions
applypatch $srcdir/fedora-fixes.patch
sed -e 's/-Werror//' -i configure.ac
autoreconf -vif
CFLAGS="$CFLAGS -Wno-error=array-bounds" \
./configure \
--prefix="" \
--sysconfdir=/etc \
--disable-static \
$builddist
make
make install DESTDIR=$pkg
cp COPYING $pkgdocs/
mkfinalpkg
}
sha512sums="
0aaa110cb1528dd3c325bbea08987316194fb7e40d9727dc8eaf02f51c5e6fc03e0d2991ad296b0cbe1c230ff4e75a6dcb975c79084cd011bf79cd92b6ac05ab libomxil-bellagio-0.9.3.tar.lz
6a763c164ed21ad9a8c0da01e02e823ed40f2539b68ef96d8052739dd433daa472c7d05f86bb06b95269a819403aa2e27670d37475ecf108f808bf9fa3ede413 fedora-fixes.patch
"

28
xorg/mesa/mesa.SMBuild
View file

@ -1,5 +1,5 @@
app=mesa
version=20.1.4
version=22.3.6
build=2sml
homepage="https://www.mesa3d.org/"
download="https://archive.mesa3d.org/mesa-$version.tar.xz"
@ -14,16 +14,9 @@ build() {
cd $app-$version
fixbuilddirpermissions
applypatch $srcdir/add-use-elf-tls.patch
applypatch $srcdir/adjust-cache-deflate-buffer.patch
applypatch $srcdir/disable-rgb10-by-default.patch
applypatch $srcdir/musl-fix-includes.patch
export CFLAGS="$CFLAGS -D_XOPEN_SOURCE=700"
if [ "$arch" = "aarch64" ]; then
dridrivers=""
galliumdrivers="v3d,vc4,kmsro"
galliumdrivers="swrast,v3d,vc4,kmsro"
elif [ "$arch" = "x86_64" ]; then
dridrivers="i915,i965,nouveau,r100,r200,swrast"
@ -41,12 +34,15 @@ build() {
-Dplatforms="x11,wayland" \
-Dgallium-nine=false \
-Degl=true \
-Dgles1=false \
-Dgles2=true \
-Dgles1=disabled \
-Dgles2=enabled \
-Dglx=dri \
-Dopengl=true \
-Dvalgrind=false \
-Dlibunwind=false
-Dlibunwind=false \
-Db_lto=false \
-Dllvm=enabled \
-Dshared-llvm=enabled
ninja
DESTDIR="$pkg" ninja install
@ -57,9 +53,5 @@ build() {
}
sha512sums="
9c5ad845373ac50ba56502379fe398ee08448faea3e4bbba49ec1d182846070c1c1a64f03f0f32525d6ffaabd9ec4a38e5e0bd014444141dec145add86cfcee6 mesa-20.1.4.tar.lz
cd3961319079882e692176f654feb21ddfeccafcc7f4ce4f8d21160f36deda768eb3ee7f49dae2e18f0587d321473adc7f127a2d75ae143ec29168bcc0fe12c0 add-use-elf-tls.patch
cdf22d2da3328e116c379264886bd01fd3ad5cc45fe03dc6fd97bdc4794502598ee195c0b9d975fa264d6ac31c6fa108c0535c91800ecf4fcabfd308e53074cc adjust-cache-deflate-buffer.patch
ede642ae9be64c3fc5fee46e8bf1b2f982191febcfadb235b0261868213c7cca11d38bb53b972f3184a887430f37b9f470a9b12fd03cf54b98315ec75c4d8ed4 disable-rgb10-by-default.patch
cf849044d6cc7d2af4ff015208fb09d70bf9660538699797da21bda2ecb7c1892d312af83d05116afd826708d9caafb1d05a13f09139c558aea6fee931e3eee7 musl-fix-includes.patch
"
1346ff598ab783b726cc07fa4fee6f307a3ec610541a336411d95bfca9bd79f13040ec1f7d1e73a7b29c1a3e2e236e710344c79c867f44c5a2440df67841a6d3 mesa-22.3.6.tar.lz
"

7
xorg/xorg-server/xorg-server.SMBuild
View file

@ -1,5 +1,5 @@
app=xorg-server
version=1.20.8
version=1.20.14
build=2sml
homepage="https://www.x.org/wiki/"
download="https://www.x.org/releases/individual/xserver/xorg-server-$version.tar.gz"
@ -28,14 +28,11 @@ build() {
make
make install DESTDIR=$pkg
# Sample xorg.conf file for the raspberry pi, may be removed later on
[ "$ARCH" = "aarch64" ] && install -Dm 644 $srcdir/xorg.conf $pkg/etc/X11/xorg.conf
cp COPYING $pkgdocs/
mkfinalpkg
}
sha512sums="
f53472556ace5defec083c5227936bb9f428e22cf088e91210bdc9a57761af2513fbf96e9afe7e3a21a819af32e626bb30c03bbbc306f73c5002735d8ce1ab48 xorg-server-1.20.8.tar.lz
dd3375ded9355a65e8efc238c3c5348ec348e499aa5cba1a5a41d4a57c5ba6e7e8e15125146012455093f84b7b89ccfa0a34ecc462bd99fb39bf281f81228cd4 xorg-server-1.20.14.tar.lz
"