* Re: [PR PATCH] [Updated] Remove libdri2-git
2020-08-04 22:17 [PR PATCH] Remove libdri2-git ericonr
@ 2020-08-05 1:16 ` ericonr
2020-08-05 1:37 ` [PR PATCH] [Updated] Clean up libdri2-git ericonr
` (8 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: ericonr @ 2020-08-05 1:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 399 bytes --]
There is an updated pull request by ericonr against master on the void-packages repository
https://github.com/ericonr/void-packages libdri2
https://github.com/void-linux/void-packages/pull/24058
Remove libdri2-git
Not sure how to test DRI2, but `xorg-server` itself seems to include all it needs for DRI2.
A patch file from https://github.com/void-linux/void-packages/pull/24058.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libdri2-24058.patch --]
[-- Type: text/x-diff, Size: 5048 bytes --]
From 9a6bcd891275b22f371961f2d90a04fddbc5b95e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 4 Aug 2020 19:14:39 -0300
Subject: [PATCH 1/3] xorg-server: remove libdri2 from makedeps.
Obsolete.
---
srcpkgs/xorg-server/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 83f5b1b1496..b1b0dafb4d8 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -1,7 +1,7 @@
# Template file for 'xorg-server'
pkgname=xorg-server
version=1.20.8
-revision=4
+revision=5
build_style=meson
configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
-Dxvfb=true -Dhal=false -Dudev=true -Dxkb_dir=/usr/share/X11/xkb
@@ -13,7 +13,7 @@ configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
hostmakedepends="pkg-config wayland-devel xkbcomp flex gzip"
makedepends="MesaLib-devel libXaw-devel libXfont-devel libXfont2-devel
libXrender-devel libXres-devel libXtst-devel libXv-devel libXxf86dga-devel
- libdmx-devel libdri2-devel-git libepoxy-devel libressl-devel libxkbfile-devel
+ libdmx-devel libepoxy-devel libressl-devel libxkbfile-devel
libxkbui-devel pixman-devel wayland-devel wayland-protocols
xcb-util-image-devel xcb-util-keysyms-devel xcb-util-renderutil-devel
xcb-util-wm-devel xkbcomp nettle-devel $(vopt_if elogind 'dbus-devel')"
From bacfe5d226a6b5427b320767af368811aaa063df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 4 Aug 2020 19:15:02 -0300
Subject: [PATCH 2/3] libdri2-git: clean up package.
---
srcpkgs/libdri2-git/template | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/libdri2-git/template b/srcpkgs/libdri2-git/template
index 15299d525dc..5aa2e2a8396 100644
--- a/srcpkgs/libdri2-git/template
+++ b/srcpkgs/libdri2-git/template
@@ -1,7 +1,9 @@
# Template file for 'libdri2-git'
pkgname=libdri2-git
version=20140317
-revision=2
+revision=3
+_commit=4f1eef3183df2b270c3d5cbef07343ee5127a6a4
+build_wrksrc=${pkgname}-${_commit}
build_style=gnu-configure
configure_args="--enable-malloc0returnsnull"
hostmakedepends="automake libtool pkg-config xorg-util-macros git"
@@ -10,18 +12,20 @@ short_desc="Library for the DRI2 extension to the X Window System"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://github.com/robclark/libdri2"
+distfiles="${homepage}/archive/${_commit}.tar.gz"
+checksum=7c427f5c3fbda3d1df1dc77129e87605f4af1f3ad2adf2653c560d1703aa4395
provides="libdri2-1.0_1"
replaces="libdri2>=0"
-do_fetch() {
- git clone git://github.com/robclark/libdri2 ${pkgname}-${version}
-}
-
pre_configure() {
NOCONFIGURE=1 ./autogen.sh
}
+post_install() {
+ vlicense COPYING LICENSE
+}
+
libdri2-devel-git_package() {
short_desc+=" - development files"
depends="libX11-devel libXext-devel ${sourcepkg}>=${version}_${revision}"
From 0e1a28981d835feb189742526a400077ae52316e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 4 Aug 2020 22:16:07 -0300
Subject: [PATCH 3/3] sunxi-mali: clean up, mark as nonfree.
---
srcpkgs/sunxi-mali/template | 25 +++++++++++++++++--------
1 file changed, 17 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/sunxi-mali/template b/srcpkgs/sunxi-mali/template
index 42b20a453a8..946223e7e79 100644
--- a/srcpkgs/sunxi-mali/template
+++ b/srcpkgs/sunxi-mali/template
@@ -1,7 +1,12 @@
# Template file for 'sunxi-mali'
pkgname=sunxi-mali
version=20181122
-revision=1
+revision=2
+_commit=d343311efc8db166d8371b28494f0f27b6a58724
+_lib_commit=1c5063f43cdc9de341c0d63b2e3921cab86c7742
+archs="armv7l"
+create_wrksrc=yes
+build_wrksrc=${pkgname}-${_commit}
build_style=gnu-makefile
hostmakedepends="git pkg-config perl"
makedepends="libXfixes-devel libump-git-devel libdri2-devel-git libdrm-devel"
@@ -9,26 +14,30 @@ short_desc="Linux sunxi MALI userpace propietary libraries"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://github.com/linux-sunxi/sunxi-mali"
-nostrip=yes
-archs="armv7l"
+distfiles="${homepage}/archive/${_commit}.tar.gz
+ https://github.com/linux-sunxi/sunxi-mali-proprietary/archive/${_lib_commit}.tar.gz"
+checksum="5ae27be532928667aa820a0aa9813dde545c224294b9402b27b6ca68f4d69ee4
+ f87d93629072dd0306ffe1200425188129e5f7f97750126dff38464ea707f673"
provides="libEGL-1.0_1 libGLES-1.0_1"
replaces="libEGL>=0 libGLES>=0"
+repository=nonfree
+nostrip=yes
-do_fetch() {
- git clone https://github.com/linux-sunxi/sunxi-mali.git ${wrksrc}
- cd ${wrksrc}
- git submodule init
- git submodule update
+post_extract() {
+ cp -r sunxi-mali-proprietary-${_lib_commit}/* ${pkgname}-${_commit}/lib/mali/
}
do_build() {
VERSION=r3p0 ABI=armhf EGL_TYPE=x11 make config
make ${makejobs}
+
+ sed -n '1,22p' version/version.c > LICENSE
}
do_install() {
vmkdir usr/lib
make DESTDIR=${DESTDIR} install
+ vlicense LICENSE
}
sunxi-mali-devel_package() {
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PR PATCH] [Updated] Clean up libdri2-git
2020-08-04 22:17 [PR PATCH] Remove libdri2-git ericonr
2020-08-05 1:16 ` [PR PATCH] [Updated] " ericonr
@ 2020-08-05 1:37 ` ericonr
2020-08-05 2:59 ` ericonr
` (7 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: ericonr @ 2020-08-05 1:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 401 bytes --]
There is an updated pull request by ericonr against master on the void-packages repository
https://github.com/ericonr/void-packages libdri2
https://github.com/void-linux/void-packages/pull/24058
Clean up libdri2-git
Not sure how to test DRI2, but `xorg-server` itself seems to include all it needs for DRI2.
A patch file from https://github.com/void-linux/void-packages/pull/24058.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libdri2-24058.patch --]
[-- Type: text/x-diff, Size: 5039 bytes --]
From 9a6bcd891275b22f371961f2d90a04fddbc5b95e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 4 Aug 2020 19:14:39 -0300
Subject: [PATCH 1/3] xorg-server: remove libdri2 from makedeps.
Obsolete.
---
srcpkgs/xorg-server/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 83f5b1b1496..b1b0dafb4d8 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -1,7 +1,7 @@
# Template file for 'xorg-server'
pkgname=xorg-server
version=1.20.8
-revision=4
+revision=5
build_style=meson
configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
-Dxvfb=true -Dhal=false -Dudev=true -Dxkb_dir=/usr/share/X11/xkb
@@ -13,7 +13,7 @@ configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
hostmakedepends="pkg-config wayland-devel xkbcomp flex gzip"
makedepends="MesaLib-devel libXaw-devel libXfont-devel libXfont2-devel
libXrender-devel libXres-devel libXtst-devel libXv-devel libXxf86dga-devel
- libdmx-devel libdri2-devel-git libepoxy-devel libressl-devel libxkbfile-devel
+ libdmx-devel libepoxy-devel libressl-devel libxkbfile-devel
libxkbui-devel pixman-devel wayland-devel wayland-protocols
xcb-util-image-devel xcb-util-keysyms-devel xcb-util-renderutil-devel
xcb-util-wm-devel xkbcomp nettle-devel $(vopt_if elogind 'dbus-devel')"
From 9f6953dcb08dd06810a443a47227c98471d313d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 4 Aug 2020 19:15:02 -0300
Subject: [PATCH 2/3] libdri2-git: clean up package.
---
srcpkgs/libdri2-git/template | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/libdri2-git/template b/srcpkgs/libdri2-git/template
index 15299d525dc..6c5b60d35d7 100644
--- a/srcpkgs/libdri2-git/template
+++ b/srcpkgs/libdri2-git/template
@@ -1,7 +1,9 @@
# Template file for 'libdri2-git'
pkgname=libdri2-git
version=20140317
-revision=2
+revision=3
+_commit=4f1eef3183df2b270c3d5cbef07343ee5127a6a4
+wrksrc=libdri2-${_commit}
build_style=gnu-configure
configure_args="--enable-malloc0returnsnull"
hostmakedepends="automake libtool pkg-config xorg-util-macros git"
@@ -10,18 +12,20 @@ short_desc="Library for the DRI2 extension to the X Window System"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://github.com/robclark/libdri2"
+distfiles="${homepage}/archive/${_commit}.tar.gz"
+checksum=7c427f5c3fbda3d1df1dc77129e87605f4af1f3ad2adf2653c560d1703aa4395
provides="libdri2-1.0_1"
replaces="libdri2>=0"
-do_fetch() {
- git clone git://github.com/robclark/libdri2 ${pkgname}-${version}
-}
-
pre_configure() {
NOCONFIGURE=1 ./autogen.sh
}
+post_install() {
+ vlicense COPYING LICENSE
+}
+
libdri2-devel-git_package() {
short_desc+=" - development files"
depends="libX11-devel libXext-devel ${sourcepkg}>=${version}_${revision}"
From 704630e6a7c02250a55f5a86c49e13cd92df1877 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 4 Aug 2020 22:16:07 -0300
Subject: [PATCH 3/3] sunxi-mali: clean up, mark as nonfree.
---
srcpkgs/sunxi-mali/template | 25 +++++++++++++++++--------
1 file changed, 17 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/sunxi-mali/template b/srcpkgs/sunxi-mali/template
index 42b20a453a8..946223e7e79 100644
--- a/srcpkgs/sunxi-mali/template
+++ b/srcpkgs/sunxi-mali/template
@@ -1,7 +1,12 @@
# Template file for 'sunxi-mali'
pkgname=sunxi-mali
version=20181122
-revision=1
+revision=2
+_commit=d343311efc8db166d8371b28494f0f27b6a58724
+_lib_commit=1c5063f43cdc9de341c0d63b2e3921cab86c7742
+archs="armv7l"
+create_wrksrc=yes
+build_wrksrc=${pkgname}-${_commit}
build_style=gnu-makefile
hostmakedepends="git pkg-config perl"
makedepends="libXfixes-devel libump-git-devel libdri2-devel-git libdrm-devel"
@@ -9,26 +14,30 @@ short_desc="Linux sunxi MALI userpace propietary libraries"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://github.com/linux-sunxi/sunxi-mali"
-nostrip=yes
-archs="armv7l"
+distfiles="${homepage}/archive/${_commit}.tar.gz
+ https://github.com/linux-sunxi/sunxi-mali-proprietary/archive/${_lib_commit}.tar.gz"
+checksum="5ae27be532928667aa820a0aa9813dde545c224294b9402b27b6ca68f4d69ee4
+ f87d93629072dd0306ffe1200425188129e5f7f97750126dff38464ea707f673"
provides="libEGL-1.0_1 libGLES-1.0_1"
replaces="libEGL>=0 libGLES>=0"
+repository=nonfree
+nostrip=yes
-do_fetch() {
- git clone https://github.com/linux-sunxi/sunxi-mali.git ${wrksrc}
- cd ${wrksrc}
- git submodule init
- git submodule update
+post_extract() {
+ cp -r sunxi-mali-proprietary-${_lib_commit}/* ${pkgname}-${_commit}/lib/mali/
}
do_build() {
VERSION=r3p0 ABI=armhf EGL_TYPE=x11 make config
make ${makejobs}
+
+ sed -n '1,22p' version/version.c > LICENSE
}
do_install() {
vmkdir usr/lib
make DESTDIR=${DESTDIR} install
+ vlicense LICENSE
}
sunxi-mali-devel_package() {
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PR PATCH] [Updated] Clean up libdri2-git
2020-08-04 22:17 [PR PATCH] Remove libdri2-git ericonr
2020-08-05 1:16 ` [PR PATCH] [Updated] " ericonr
2020-08-05 1:37 ` [PR PATCH] [Updated] Clean up libdri2-git ericonr
@ 2020-08-05 2:59 ` ericonr
2020-08-05 3:20 ` ericonr
` (6 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: ericonr @ 2020-08-05 2:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 401 bytes --]
There is an updated pull request by ericonr against master on the void-packages repository
https://github.com/ericonr/void-packages libdri2
https://github.com/void-linux/void-packages/pull/24058
Clean up libdri2-git
Not sure how to test DRI2, but `xorg-server` itself seems to include all it needs for DRI2.
A patch file from https://github.com/void-linux/void-packages/pull/24058.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libdri2-24058.patch --]
[-- Type: text/x-diff, Size: 5809 bytes --]
From 9a6bcd891275b22f371961f2d90a04fddbc5b95e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 4 Aug 2020 19:14:39 -0300
Subject: [PATCH 1/3] xorg-server: remove libdri2 from makedeps.
Obsolete.
---
srcpkgs/xorg-server/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 83f5b1b1496..b1b0dafb4d8 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -1,7 +1,7 @@
# Template file for 'xorg-server'
pkgname=xorg-server
version=1.20.8
-revision=4
+revision=5
build_style=meson
configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
-Dxvfb=true -Dhal=false -Dudev=true -Dxkb_dir=/usr/share/X11/xkb
@@ -13,7 +13,7 @@ configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
hostmakedepends="pkg-config wayland-devel xkbcomp flex gzip"
makedepends="MesaLib-devel libXaw-devel libXfont-devel libXfont2-devel
libXrender-devel libXres-devel libXtst-devel libXv-devel libXxf86dga-devel
- libdmx-devel libdri2-devel-git libepoxy-devel libressl-devel libxkbfile-devel
+ libdmx-devel libepoxy-devel libressl-devel libxkbfile-devel
libxkbui-devel pixman-devel wayland-devel wayland-protocols
xcb-util-image-devel xcb-util-keysyms-devel xcb-util-renderutil-devel
xcb-util-wm-devel xkbcomp nettle-devel $(vopt_if elogind 'dbus-devel')"
From 9f6953dcb08dd06810a443a47227c98471d313d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 4 Aug 2020 19:15:02 -0300
Subject: [PATCH 2/3] libdri2-git: clean up package.
---
srcpkgs/libdri2-git/template | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/libdri2-git/template b/srcpkgs/libdri2-git/template
index 15299d525dc..6c5b60d35d7 100644
--- a/srcpkgs/libdri2-git/template
+++ b/srcpkgs/libdri2-git/template
@@ -1,7 +1,9 @@
# Template file for 'libdri2-git'
pkgname=libdri2-git
version=20140317
-revision=2
+revision=3
+_commit=4f1eef3183df2b270c3d5cbef07343ee5127a6a4
+wrksrc=libdri2-${_commit}
build_style=gnu-configure
configure_args="--enable-malloc0returnsnull"
hostmakedepends="automake libtool pkg-config xorg-util-macros git"
@@ -10,18 +12,20 @@ short_desc="Library for the DRI2 extension to the X Window System"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://github.com/robclark/libdri2"
+distfiles="${homepage}/archive/${_commit}.tar.gz"
+checksum=7c427f5c3fbda3d1df1dc77129e87605f4af1f3ad2adf2653c560d1703aa4395
provides="libdri2-1.0_1"
replaces="libdri2>=0"
-do_fetch() {
- git clone git://github.com/robclark/libdri2 ${pkgname}-${version}
-}
-
pre_configure() {
NOCONFIGURE=1 ./autogen.sh
}
+post_install() {
+ vlicense COPYING LICENSE
+}
+
libdri2-devel-git_package() {
short_desc+=" - development files"
depends="libX11-devel libXext-devel ${sourcepkg}>=${version}_${revision}"
From 4ed2b03df848598f38fb9bfa963c15b5981d5838 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 4 Aug 2020 22:16:07 -0300
Subject: [PATCH 3/3] sunxi-mali: clean up, mark as nonfree.
---
srcpkgs/sunxi-mali/patches/make-tabs.patch | 4 ++--
srcpkgs/sunxi-mali/template | 25 +++++++++++++++-------
2 files changed, 19 insertions(+), 10 deletions(-)
diff --git a/srcpkgs/sunxi-mali/patches/make-tabs.patch b/srcpkgs/sunxi-mali/patches/make-tabs.patch
index 796dd3ae620..27ebbd0d546 100644
--- a/srcpkgs/sunxi-mali/patches/make-tabs.patch
+++ b/srcpkgs/sunxi-mali/patches/make-tabs.patch
@@ -1,5 +1,5 @@
---- lib/mali/Makefile.split.orig 2014-01-29 13:32:24.446817426 +0100
-+++ lib/mali/Makefile.split 2014-01-29 13:33:03.822133629 +0100
+--- sunxi-mali-d343311efc8db166d8371b28494f0f27b6a58724/lib/mali/Makefile.split.orig 2014-01-29 13:32:24.446817426 +0100
++++ sunxi-mali-d343311efc8db166d8371b28494f0f27b6a58724/lib/mali/Makefile.split 2014-01-29 13:33:03.822133629 +0100
@@ -1,16 +1,16 @@
# Makefile for when everything is split up nicely.
diff --git a/srcpkgs/sunxi-mali/template b/srcpkgs/sunxi-mali/template
index 42b20a453a8..946223e7e79 100644
--- a/srcpkgs/sunxi-mali/template
+++ b/srcpkgs/sunxi-mali/template
@@ -1,7 +1,12 @@
# Template file for 'sunxi-mali'
pkgname=sunxi-mali
version=20181122
-revision=1
+revision=2
+_commit=d343311efc8db166d8371b28494f0f27b6a58724
+_lib_commit=1c5063f43cdc9de341c0d63b2e3921cab86c7742
+archs="armv7l"
+create_wrksrc=yes
+build_wrksrc=${pkgname}-${_commit}
build_style=gnu-makefile
hostmakedepends="git pkg-config perl"
makedepends="libXfixes-devel libump-git-devel libdri2-devel-git libdrm-devel"
@@ -9,26 +14,30 @@ short_desc="Linux sunxi MALI userpace propietary libraries"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://github.com/linux-sunxi/sunxi-mali"
-nostrip=yes
-archs="armv7l"
+distfiles="${homepage}/archive/${_commit}.tar.gz
+ https://github.com/linux-sunxi/sunxi-mali-proprietary/archive/${_lib_commit}.tar.gz"
+checksum="5ae27be532928667aa820a0aa9813dde545c224294b9402b27b6ca68f4d69ee4
+ f87d93629072dd0306ffe1200425188129e5f7f97750126dff38464ea707f673"
provides="libEGL-1.0_1 libGLES-1.0_1"
replaces="libEGL>=0 libGLES>=0"
+repository=nonfree
+nostrip=yes
-do_fetch() {
- git clone https://github.com/linux-sunxi/sunxi-mali.git ${wrksrc}
- cd ${wrksrc}
- git submodule init
- git submodule update
+post_extract() {
+ cp -r sunxi-mali-proprietary-${_lib_commit}/* ${pkgname}-${_commit}/lib/mali/
}
do_build() {
VERSION=r3p0 ABI=armhf EGL_TYPE=x11 make config
make ${makejobs}
+
+ sed -n '1,22p' version/version.c > LICENSE
}
do_install() {
vmkdir usr/lib
make DESTDIR=${DESTDIR} install
+ vlicense LICENSE
}
sunxi-mali-devel_package() {
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PR PATCH] [Updated] Clean up libdri2-git
2020-08-04 22:17 [PR PATCH] Remove libdri2-git ericonr
` (2 preceding siblings ...)
2020-08-05 2:59 ` ericonr
@ 2020-08-05 3:20 ` ericonr
2020-08-07 2:45 ` ericonr
` (5 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: ericonr @ 2020-08-05 3:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 401 bytes --]
There is an updated pull request by ericonr against master on the void-packages repository
https://github.com/ericonr/void-packages libdri2
https://github.com/void-linux/void-packages/pull/24058
Clean up libdri2-git
Not sure how to test DRI2, but `xorg-server` itself seems to include all it needs for DRI2.
A patch file from https://github.com/void-linux/void-packages/pull/24058.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libdri2-24058.patch --]
[-- Type: text/x-diff, Size: 6754 bytes --]
From 9a6bcd891275b22f371961f2d90a04fddbc5b95e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 4 Aug 2020 19:14:39 -0300
Subject: [PATCH 1/3] xorg-server: remove libdri2 from makedeps.
Obsolete.
---
srcpkgs/xorg-server/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 83f5b1b1496..b1b0dafb4d8 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -1,7 +1,7 @@
# Template file for 'xorg-server'
pkgname=xorg-server
version=1.20.8
-revision=4
+revision=5
build_style=meson
configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
-Dxvfb=true -Dhal=false -Dudev=true -Dxkb_dir=/usr/share/X11/xkb
@@ -13,7 +13,7 @@ configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
hostmakedepends="pkg-config wayland-devel xkbcomp flex gzip"
makedepends="MesaLib-devel libXaw-devel libXfont-devel libXfont2-devel
libXrender-devel libXres-devel libXtst-devel libXv-devel libXxf86dga-devel
- libdmx-devel libdri2-devel-git libepoxy-devel libressl-devel libxkbfile-devel
+ libdmx-devel libepoxy-devel libressl-devel libxkbfile-devel
libxkbui-devel pixman-devel wayland-devel wayland-protocols
xcb-util-image-devel xcb-util-keysyms-devel xcb-util-renderutil-devel
xcb-util-wm-devel xkbcomp nettle-devel $(vopt_if elogind 'dbus-devel')"
From 9f6953dcb08dd06810a443a47227c98471d313d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 4 Aug 2020 19:15:02 -0300
Subject: [PATCH 2/3] libdri2-git: clean up package.
---
srcpkgs/libdri2-git/template | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/libdri2-git/template b/srcpkgs/libdri2-git/template
index 15299d525dc..6c5b60d35d7 100644
--- a/srcpkgs/libdri2-git/template
+++ b/srcpkgs/libdri2-git/template
@@ -1,7 +1,9 @@
# Template file for 'libdri2-git'
pkgname=libdri2-git
version=20140317
-revision=2
+revision=3
+_commit=4f1eef3183df2b270c3d5cbef07343ee5127a6a4
+wrksrc=libdri2-${_commit}
build_style=gnu-configure
configure_args="--enable-malloc0returnsnull"
hostmakedepends="automake libtool pkg-config xorg-util-macros git"
@@ -10,18 +12,20 @@ short_desc="Library for the DRI2 extension to the X Window System"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://github.com/robclark/libdri2"
+distfiles="${homepage}/archive/${_commit}.tar.gz"
+checksum=7c427f5c3fbda3d1df1dc77129e87605f4af1f3ad2adf2653c560d1703aa4395
provides="libdri2-1.0_1"
replaces="libdri2>=0"
-do_fetch() {
- git clone git://github.com/robclark/libdri2 ${pkgname}-${version}
-}
-
pre_configure() {
NOCONFIGURE=1 ./autogen.sh
}
+post_install() {
+ vlicense COPYING LICENSE
+}
+
libdri2-devel-git_package() {
short_desc+=" - development files"
depends="libX11-devel libXext-devel ${sourcepkg}>=${version}_${revision}"
From c3d9765735a18b2dde85acddb0b01151be63ad3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 4 Aug 2020 22:16:07 -0300
Subject: [PATCH 3/3] sunxi-mali: clean up, mark as nonfree.
---
srcpkgs/sunxi-mali/patches/make-tabs.patch | 29 ----------------------
srcpkgs/sunxi-mali/template | 25 +++++++++++++------
2 files changed, 17 insertions(+), 37 deletions(-)
delete mode 100644 srcpkgs/sunxi-mali/patches/make-tabs.patch
diff --git a/srcpkgs/sunxi-mali/patches/make-tabs.patch b/srcpkgs/sunxi-mali/patches/make-tabs.patch
deleted file mode 100644
index 796dd3ae620..00000000000
--- a/srcpkgs/sunxi-mali/patches/make-tabs.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- lib/mali/Makefile.split.orig 2014-01-29 13:32:24.446817426 +0100
-+++ lib/mali/Makefile.split 2014-01-29 13:33:03.822133629 +0100
-@@ -1,16 +1,16 @@
- # Makefile for when everything is split up nicely.
-
- install: libMali.so libEGL.so.1.4 libGLESv1_CM.so.1.1 libGLESv2.so.2.0
-- $(INSTALL_DATA) $^ $(libdir)
-+ $(INSTALL_DATA) $^ $(libdir)
-
-- $(RM) $(libdir)libEGL.so.1 $(libdir)libEGL.so
-- $(LN) libEGL.so.1.4 $(libdir)libEGL.so.1
-- $(LN) libEGL.so.1 $(libdir)libEGL.so
-+ $(RM) $(libdir)libEGL.so.1 $(libdir)libEGL.so
-+ $(LN) libEGL.so.1.4 $(libdir)libEGL.so.1
-+ $(LN) libEGL.so.1 $(libdir)libEGL.so
-
-- $(RM) $(libdir)libGLESv1_CM.so.1 $(libdir)libGLESv1_CM.so
-- $(LN) libGLESv1_CM.so.1.1 $(libdir)libGLESv1_CM.so.1
-- $(LN) libGLESv1_CM.so.1 $(libdir)libGLESv1_CM.so
-+ $(RM) $(libdir)libGLESv1_CM.so.1 $(libdir)libGLESv1_CM.so
-+ $(LN) libGLESv1_CM.so.1.1 $(libdir)libGLESv1_CM.so.1
-+ $(LN) libGLESv1_CM.so.1 $(libdir)libGLESv1_CM.so
-
-- $(RM) $(libdir)libGLESv2.so.2 $(libdir)libGLESv2.so
-- $(LN) libGLESv2.so.2.0 $(libdir)libGLESv2.so.2
-- $(LN) libGLESv2.so.2 $(libdir)libGLESv2.so
-+ $(RM) $(libdir)libGLESv2.so.2 $(libdir)libGLESv2.so
-+ $(LN) libGLESv2.so.2.0 $(libdir)libGLESv2.so.2
-+ $(LN) libGLESv2.so.2 $(libdir)libGLESv2.so
diff --git a/srcpkgs/sunxi-mali/template b/srcpkgs/sunxi-mali/template
index 42b20a453a8..946223e7e79 100644
--- a/srcpkgs/sunxi-mali/template
+++ b/srcpkgs/sunxi-mali/template
@@ -1,7 +1,12 @@
# Template file for 'sunxi-mali'
pkgname=sunxi-mali
version=20181122
-revision=1
+revision=2
+_commit=d343311efc8db166d8371b28494f0f27b6a58724
+_lib_commit=1c5063f43cdc9de341c0d63b2e3921cab86c7742
+archs="armv7l"
+create_wrksrc=yes
+build_wrksrc=${pkgname}-${_commit}
build_style=gnu-makefile
hostmakedepends="git pkg-config perl"
makedepends="libXfixes-devel libump-git-devel libdri2-devel-git libdrm-devel"
@@ -9,26 +14,30 @@ short_desc="Linux sunxi MALI userpace propietary libraries"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://github.com/linux-sunxi/sunxi-mali"
-nostrip=yes
-archs="armv7l"
+distfiles="${homepage}/archive/${_commit}.tar.gz
+ https://github.com/linux-sunxi/sunxi-mali-proprietary/archive/${_lib_commit}.tar.gz"
+checksum="5ae27be532928667aa820a0aa9813dde545c224294b9402b27b6ca68f4d69ee4
+ f87d93629072dd0306ffe1200425188129e5f7f97750126dff38464ea707f673"
provides="libEGL-1.0_1 libGLES-1.0_1"
replaces="libEGL>=0 libGLES>=0"
+repository=nonfree
+nostrip=yes
-do_fetch() {
- git clone https://github.com/linux-sunxi/sunxi-mali.git ${wrksrc}
- cd ${wrksrc}
- git submodule init
- git submodule update
+post_extract() {
+ cp -r sunxi-mali-proprietary-${_lib_commit}/* ${pkgname}-${_commit}/lib/mali/
}
do_build() {
VERSION=r3p0 ABI=armhf EGL_TYPE=x11 make config
make ${makejobs}
+
+ sed -n '1,22p' version/version.c > LICENSE
}
do_install() {
vmkdir usr/lib
make DESTDIR=${DESTDIR} install
+ vlicense LICENSE
}
sunxi-mali-devel_package() {
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PR PATCH] [Updated] Clean up libdri2-git
2020-08-04 22:17 [PR PATCH] Remove libdri2-git ericonr
` (3 preceding siblings ...)
2020-08-05 3:20 ` ericonr
@ 2020-08-07 2:45 ` ericonr
2020-08-31 16:56 ` ericonr
` (4 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: ericonr @ 2020-08-07 2:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 401 bytes --]
There is an updated pull request by ericonr against master on the void-packages repository
https://github.com/ericonr/void-packages libdri2
https://github.com/void-linux/void-packages/pull/24058
Clean up libdri2-git
Not sure how to test DRI2, but `xorg-server` itself seems to include all it needs for DRI2.
A patch file from https://github.com/void-linux/void-packages/pull/24058.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libdri2-24058.patch --]
[-- Type: text/x-diff, Size: 6891 bytes --]
From 9a6bcd891275b22f371961f2d90a04fddbc5b95e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 4 Aug 2020 19:14:39 -0300
Subject: [PATCH 1/3] xorg-server: remove libdri2 from makedeps.
Obsolete.
---
srcpkgs/xorg-server/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 83f5b1b1496..b1b0dafb4d8 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -1,7 +1,7 @@
# Template file for 'xorg-server'
pkgname=xorg-server
version=1.20.8
-revision=4
+revision=5
build_style=meson
configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
-Dxvfb=true -Dhal=false -Dudev=true -Dxkb_dir=/usr/share/X11/xkb
@@ -13,7 +13,7 @@ configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
hostmakedepends="pkg-config wayland-devel xkbcomp flex gzip"
makedepends="MesaLib-devel libXaw-devel libXfont-devel libXfont2-devel
libXrender-devel libXres-devel libXtst-devel libXv-devel libXxf86dga-devel
- libdmx-devel libdri2-devel-git libepoxy-devel libressl-devel libxkbfile-devel
+ libdmx-devel libepoxy-devel libressl-devel libxkbfile-devel
libxkbui-devel pixman-devel wayland-devel wayland-protocols
xcb-util-image-devel xcb-util-keysyms-devel xcb-util-renderutil-devel
xcb-util-wm-devel xkbcomp nettle-devel $(vopt_if elogind 'dbus-devel')"
From 3c81259fabbdfc1e7c1a9d3d55ac4e844ece3246 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 4 Aug 2020 19:15:02 -0300
Subject: [PATCH 2/3] libdri2-git: clean up package.
---
srcpkgs/libdri2-git/template | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/libdri2-git/template b/srcpkgs/libdri2-git/template
index 15299d525dc..60e0455aa8c 100644
--- a/srcpkgs/libdri2-git/template
+++ b/srcpkgs/libdri2-git/template
@@ -1,27 +1,31 @@
# Template file for 'libdri2-git'
pkgname=libdri2-git
version=20140317
-revision=2
+revision=3
+_commit=4f1eef3183df2b270c3d5cbef07343ee5127a6a4
+wrksrc=libdri2-${_commit}
build_style=gnu-configure
configure_args="--enable-malloc0returnsnull"
-hostmakedepends="automake libtool pkg-config xorg-util-macros git"
+hostmakedepends="automake libtool pkg-config xorg-util-macros"
makedepends="xorgproto libXfixes-devel libXext-devel libdrm-devel"
short_desc="Library for the DRI2 extension to the X Window System"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://github.com/robclark/libdri2"
+distfiles="${homepage}/archive/${_commit}.tar.gz"
+checksum=7c427f5c3fbda3d1df1dc77129e87605f4af1f3ad2adf2653c560d1703aa4395
provides="libdri2-1.0_1"
replaces="libdri2>=0"
-do_fetch() {
- git clone git://github.com/robclark/libdri2 ${pkgname}-${version}
-}
-
pre_configure() {
NOCONFIGURE=1 ./autogen.sh
}
+post_install() {
+ vlicense COPYING LICENSE
+}
+
libdri2-devel-git_package() {
short_desc+=" - development files"
depends="libX11-devel libXext-devel ${sourcepkg}>=${version}_${revision}"
From 2d0cf5e0229397f12249464268392b01d002a943 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 4 Aug 2020 22:16:07 -0300
Subject: [PATCH 3/3] sunxi-mali: clean up, mark as nonfree.
---
srcpkgs/sunxi-mali/patches/make-tabs.patch | 29 ----------------------
srcpkgs/sunxi-mali/template | 27 +++++++++++++-------
2 files changed, 18 insertions(+), 38 deletions(-)
delete mode 100644 srcpkgs/sunxi-mali/patches/make-tabs.patch
diff --git a/srcpkgs/sunxi-mali/patches/make-tabs.patch b/srcpkgs/sunxi-mali/patches/make-tabs.patch
deleted file mode 100644
index 796dd3ae620..00000000000
--- a/srcpkgs/sunxi-mali/patches/make-tabs.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- lib/mali/Makefile.split.orig 2014-01-29 13:32:24.446817426 +0100
-+++ lib/mali/Makefile.split 2014-01-29 13:33:03.822133629 +0100
-@@ -1,16 +1,16 @@
- # Makefile for when everything is split up nicely.
-
- install: libMali.so libEGL.so.1.4 libGLESv1_CM.so.1.1 libGLESv2.so.2.0
-- $(INSTALL_DATA) $^ $(libdir)
-+ $(INSTALL_DATA) $^ $(libdir)
-
-- $(RM) $(libdir)libEGL.so.1 $(libdir)libEGL.so
-- $(LN) libEGL.so.1.4 $(libdir)libEGL.so.1
-- $(LN) libEGL.so.1 $(libdir)libEGL.so
-+ $(RM) $(libdir)libEGL.so.1 $(libdir)libEGL.so
-+ $(LN) libEGL.so.1.4 $(libdir)libEGL.so.1
-+ $(LN) libEGL.so.1 $(libdir)libEGL.so
-
-- $(RM) $(libdir)libGLESv1_CM.so.1 $(libdir)libGLESv1_CM.so
-- $(LN) libGLESv1_CM.so.1.1 $(libdir)libGLESv1_CM.so.1
-- $(LN) libGLESv1_CM.so.1 $(libdir)libGLESv1_CM.so
-+ $(RM) $(libdir)libGLESv1_CM.so.1 $(libdir)libGLESv1_CM.so
-+ $(LN) libGLESv1_CM.so.1.1 $(libdir)libGLESv1_CM.so.1
-+ $(LN) libGLESv1_CM.so.1 $(libdir)libGLESv1_CM.so
-
-- $(RM) $(libdir)libGLESv2.so.2 $(libdir)libGLESv2.so
-- $(LN) libGLESv2.so.2.0 $(libdir)libGLESv2.so.2
-- $(LN) libGLESv2.so.2 $(libdir)libGLESv2.so
-+ $(RM) $(libdir)libGLESv2.so.2 $(libdir)libGLESv2.so
-+ $(LN) libGLESv2.so.2.0 $(libdir)libGLESv2.so.2
-+ $(LN) libGLESv2.so.2 $(libdir)libGLESv2.so
diff --git a/srcpkgs/sunxi-mali/template b/srcpkgs/sunxi-mali/template
index 42b20a453a8..a3a234a132a 100644
--- a/srcpkgs/sunxi-mali/template
+++ b/srcpkgs/sunxi-mali/template
@@ -1,34 +1,43 @@
# Template file for 'sunxi-mali'
pkgname=sunxi-mali
version=20181122
-revision=1
+revision=2
+_commit=d343311efc8db166d8371b28494f0f27b6a58724
+_lib_commit=1c5063f43cdc9de341c0d63b2e3921cab86c7742
+archs="armv7l"
+create_wrksrc=yes
+build_wrksrc=${pkgname}-${_commit}
build_style=gnu-makefile
-hostmakedepends="git pkg-config perl"
+hostmakedepends="pkg-config perl"
makedepends="libXfixes-devel libump-git-devel libdri2-devel-git libdrm-devel"
short_desc="Linux sunxi MALI userpace propietary libraries"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://github.com/linux-sunxi/sunxi-mali"
-nostrip=yes
-archs="armv7l"
+distfiles="${homepage}/archive/${_commit}.tar.gz
+ https://github.com/linux-sunxi/sunxi-mali-proprietary/archive/${_lib_commit}.tar.gz"
+checksum="5ae27be532928667aa820a0aa9813dde545c224294b9402b27b6ca68f4d69ee4
+ f87d93629072dd0306ffe1200425188129e5f7f97750126dff38464ea707f673"
provides="libEGL-1.0_1 libGLES-1.0_1"
replaces="libEGL>=0 libGLES>=0"
+repository=nonfree
+nostrip=yes
-do_fetch() {
- git clone https://github.com/linux-sunxi/sunxi-mali.git ${wrksrc}
- cd ${wrksrc}
- git submodule init
- git submodule update
+post_extract() {
+ cp -r sunxi-mali-proprietary-${_lib_commit}/* ${pkgname}-${_commit}/lib/mali/
}
do_build() {
VERSION=r3p0 ABI=armhf EGL_TYPE=x11 make config
make ${makejobs}
+
+ sed -n '1,22p' version/version.c > LICENSE
}
do_install() {
vmkdir usr/lib
make DESTDIR=${DESTDIR} install
+ vlicense LICENSE
}
sunxi-mali-devel_package() {
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PR PATCH] [Updated] Clean up libdri2-git
2020-08-04 22:17 [PR PATCH] Remove libdri2-git ericonr
` (4 preceding siblings ...)
2020-08-07 2:45 ` ericonr
@ 2020-08-31 16:56 ` ericonr
2020-09-20 15:22 ` ericonr
` (3 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: ericonr @ 2020-08-31 16:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 401 bytes --]
There is an updated pull request by ericonr against master on the void-packages repository
https://github.com/ericonr/void-packages libdri2
https://github.com/void-linux/void-packages/pull/24058
Clean up libdri2-git
Not sure how to test DRI2, but `xorg-server` itself seems to include all it needs for DRI2.
A patch file from https://github.com/void-linux/void-packages/pull/24058.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libdri2-24058.patch --]
[-- Type: text/x-diff, Size: 6891 bytes --]
From c8712a535fb19d4f94745bd7e52b236834668990 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 4 Aug 2020 19:14:39 -0300
Subject: [PATCH 1/3] xorg-server: remove libdri2 from makedeps.
Obsolete.
---
srcpkgs/xorg-server/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 83f5b1b1496..b1b0dafb4d8 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -1,7 +1,7 @@
# Template file for 'xorg-server'
pkgname=xorg-server
version=1.20.8
-revision=4
+revision=5
build_style=meson
configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
-Dxvfb=true -Dhal=false -Dudev=true -Dxkb_dir=/usr/share/X11/xkb
@@ -13,7 +13,7 @@ configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
hostmakedepends="pkg-config wayland-devel xkbcomp flex gzip"
makedepends="MesaLib-devel libXaw-devel libXfont-devel libXfont2-devel
libXrender-devel libXres-devel libXtst-devel libXv-devel libXxf86dga-devel
- libdmx-devel libdri2-devel-git libepoxy-devel libressl-devel libxkbfile-devel
+ libdmx-devel libepoxy-devel libressl-devel libxkbfile-devel
libxkbui-devel pixman-devel wayland-devel wayland-protocols
xcb-util-image-devel xcb-util-keysyms-devel xcb-util-renderutil-devel
xcb-util-wm-devel xkbcomp nettle-devel $(vopt_if elogind 'dbus-devel')"
From 0f7ec80723a359262a5c585bf49cc1ca3c2fcf84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 4 Aug 2020 19:15:02 -0300
Subject: [PATCH 2/3] libdri2-git: clean up package.
---
srcpkgs/libdri2-git/template | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/libdri2-git/template b/srcpkgs/libdri2-git/template
index 15299d525dc..60e0455aa8c 100644
--- a/srcpkgs/libdri2-git/template
+++ b/srcpkgs/libdri2-git/template
@@ -1,27 +1,31 @@
# Template file for 'libdri2-git'
pkgname=libdri2-git
version=20140317
-revision=2
+revision=3
+_commit=4f1eef3183df2b270c3d5cbef07343ee5127a6a4
+wrksrc=libdri2-${_commit}
build_style=gnu-configure
configure_args="--enable-malloc0returnsnull"
-hostmakedepends="automake libtool pkg-config xorg-util-macros git"
+hostmakedepends="automake libtool pkg-config xorg-util-macros"
makedepends="xorgproto libXfixes-devel libXext-devel libdrm-devel"
short_desc="Library for the DRI2 extension to the X Window System"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://github.com/robclark/libdri2"
+distfiles="${homepage}/archive/${_commit}.tar.gz"
+checksum=7c427f5c3fbda3d1df1dc77129e87605f4af1f3ad2adf2653c560d1703aa4395
provides="libdri2-1.0_1"
replaces="libdri2>=0"
-do_fetch() {
- git clone git://github.com/robclark/libdri2 ${pkgname}-${version}
-}
-
pre_configure() {
NOCONFIGURE=1 ./autogen.sh
}
+post_install() {
+ vlicense COPYING LICENSE
+}
+
libdri2-devel-git_package() {
short_desc+=" - development files"
depends="libX11-devel libXext-devel ${sourcepkg}>=${version}_${revision}"
From b5fb0edc6c63727af2b74d8e601865e8ba8366fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 4 Aug 2020 22:16:07 -0300
Subject: [PATCH 3/3] sunxi-mali: clean up, mark as nonfree.
---
srcpkgs/sunxi-mali/patches/make-tabs.patch | 29 ----------------------
srcpkgs/sunxi-mali/template | 27 +++++++++++++-------
2 files changed, 18 insertions(+), 38 deletions(-)
delete mode 100644 srcpkgs/sunxi-mali/patches/make-tabs.patch
diff --git a/srcpkgs/sunxi-mali/patches/make-tabs.patch b/srcpkgs/sunxi-mali/patches/make-tabs.patch
deleted file mode 100644
index 796dd3ae620..00000000000
--- a/srcpkgs/sunxi-mali/patches/make-tabs.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- lib/mali/Makefile.split.orig 2014-01-29 13:32:24.446817426 +0100
-+++ lib/mali/Makefile.split 2014-01-29 13:33:03.822133629 +0100
-@@ -1,16 +1,16 @@
- # Makefile for when everything is split up nicely.
-
- install: libMali.so libEGL.so.1.4 libGLESv1_CM.so.1.1 libGLESv2.so.2.0
-- $(INSTALL_DATA) $^ $(libdir)
-+ $(INSTALL_DATA) $^ $(libdir)
-
-- $(RM) $(libdir)libEGL.so.1 $(libdir)libEGL.so
-- $(LN) libEGL.so.1.4 $(libdir)libEGL.so.1
-- $(LN) libEGL.so.1 $(libdir)libEGL.so
-+ $(RM) $(libdir)libEGL.so.1 $(libdir)libEGL.so
-+ $(LN) libEGL.so.1.4 $(libdir)libEGL.so.1
-+ $(LN) libEGL.so.1 $(libdir)libEGL.so
-
-- $(RM) $(libdir)libGLESv1_CM.so.1 $(libdir)libGLESv1_CM.so
-- $(LN) libGLESv1_CM.so.1.1 $(libdir)libGLESv1_CM.so.1
-- $(LN) libGLESv1_CM.so.1 $(libdir)libGLESv1_CM.so
-+ $(RM) $(libdir)libGLESv1_CM.so.1 $(libdir)libGLESv1_CM.so
-+ $(LN) libGLESv1_CM.so.1.1 $(libdir)libGLESv1_CM.so.1
-+ $(LN) libGLESv1_CM.so.1 $(libdir)libGLESv1_CM.so
-
-- $(RM) $(libdir)libGLESv2.so.2 $(libdir)libGLESv2.so
-- $(LN) libGLESv2.so.2.0 $(libdir)libGLESv2.so.2
-- $(LN) libGLESv2.so.2 $(libdir)libGLESv2.so
-+ $(RM) $(libdir)libGLESv2.so.2 $(libdir)libGLESv2.so
-+ $(LN) libGLESv2.so.2.0 $(libdir)libGLESv2.so.2
-+ $(LN) libGLESv2.so.2 $(libdir)libGLESv2.so
diff --git a/srcpkgs/sunxi-mali/template b/srcpkgs/sunxi-mali/template
index 42b20a453a8..a3a234a132a 100644
--- a/srcpkgs/sunxi-mali/template
+++ b/srcpkgs/sunxi-mali/template
@@ -1,34 +1,43 @@
# Template file for 'sunxi-mali'
pkgname=sunxi-mali
version=20181122
-revision=1
+revision=2
+_commit=d343311efc8db166d8371b28494f0f27b6a58724
+_lib_commit=1c5063f43cdc9de341c0d63b2e3921cab86c7742
+archs="armv7l"
+create_wrksrc=yes
+build_wrksrc=${pkgname}-${_commit}
build_style=gnu-makefile
-hostmakedepends="git pkg-config perl"
+hostmakedepends="pkg-config perl"
makedepends="libXfixes-devel libump-git-devel libdri2-devel-git libdrm-devel"
short_desc="Linux sunxi MALI userpace propietary libraries"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://github.com/linux-sunxi/sunxi-mali"
-nostrip=yes
-archs="armv7l"
+distfiles="${homepage}/archive/${_commit}.tar.gz
+ https://github.com/linux-sunxi/sunxi-mali-proprietary/archive/${_lib_commit}.tar.gz"
+checksum="5ae27be532928667aa820a0aa9813dde545c224294b9402b27b6ca68f4d69ee4
+ f87d93629072dd0306ffe1200425188129e5f7f97750126dff38464ea707f673"
provides="libEGL-1.0_1 libGLES-1.0_1"
replaces="libEGL>=0 libGLES>=0"
+repository=nonfree
+nostrip=yes
-do_fetch() {
- git clone https://github.com/linux-sunxi/sunxi-mali.git ${wrksrc}
- cd ${wrksrc}
- git submodule init
- git submodule update
+post_extract() {
+ cp -r sunxi-mali-proprietary-${_lib_commit}/* ${pkgname}-${_commit}/lib/mali/
}
do_build() {
VERSION=r3p0 ABI=armhf EGL_TYPE=x11 make config
make ${makejobs}
+
+ sed -n '1,22p' version/version.c > LICENSE
}
do_install() {
vmkdir usr/lib
make DESTDIR=${DESTDIR} install
+ vlicense LICENSE
}
sunxi-mali-devel_package() {
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PR PATCH] [Updated] Clean up libdri2-git
2020-08-04 22:17 [PR PATCH] Remove libdri2-git ericonr
` (5 preceding siblings ...)
2020-08-31 16:56 ` ericonr
@ 2020-09-20 15:22 ` ericonr
2020-09-24 4:39 ` ericonr
` (2 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: ericonr @ 2020-09-20 15:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 401 bytes --]
There is an updated pull request by ericonr against master on the void-packages repository
https://github.com/ericonr/void-packages libdri2
https://github.com/void-linux/void-packages/pull/24058
Clean up libdri2-git
Not sure how to test DRI2, but `xorg-server` itself seems to include all it needs for DRI2.
A patch file from https://github.com/void-linux/void-packages/pull/24058.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libdri2-24058.patch --]
[-- Type: text/x-diff, Size: 6891 bytes --]
From ddd807b321e81b415608d0a54693fdffdbdd50c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 4 Aug 2020 19:14:39 -0300
Subject: [PATCH 1/3] xorg-server: remove libdri2 from makedeps.
Obsolete.
---
srcpkgs/xorg-server/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 267b1f0cecf..4524831f1d7 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -1,7 +1,7 @@
# Template file for 'xorg-server'
pkgname=xorg-server
version=1.20.9
-revision=3
+revision=4
build_style=meson
configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
-Dxvfb=true -Dhal=false -Dudev=true -Dxkb_dir=/usr/share/X11/xkb
@@ -13,7 +13,7 @@ configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
hostmakedepends="pkg-config wayland-devel xkbcomp flex gzip"
makedepends="MesaLib-devel libXaw-devel libXfont-devel libXfont2-devel
libXrender-devel libXres-devel libXtst-devel libXv-devel libXxf86dga-devel
- libdmx-devel libdri2-devel-git libepoxy-devel libressl-devel libxkbfile-devel
+ libdmx-devel libepoxy-devel libressl-devel libxkbfile-devel
libxkbui-devel pixman-devel wayland-devel wayland-protocols
xcb-util-image-devel xcb-util-keysyms-devel xcb-util-renderutil-devel
xcb-util-wm-devel xkbcomp nettle-devel $(vopt_if elogind 'dbus-devel')"
From 7110a2fb7bef0de722de14cf39a3f95fc8445571 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 4 Aug 2020 19:15:02 -0300
Subject: [PATCH 2/3] libdri2-git: clean up package.
---
srcpkgs/libdri2-git/template | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/libdri2-git/template b/srcpkgs/libdri2-git/template
index 15299d525dc..60e0455aa8c 100644
--- a/srcpkgs/libdri2-git/template
+++ b/srcpkgs/libdri2-git/template
@@ -1,27 +1,31 @@
# Template file for 'libdri2-git'
pkgname=libdri2-git
version=20140317
-revision=2
+revision=3
+_commit=4f1eef3183df2b270c3d5cbef07343ee5127a6a4
+wrksrc=libdri2-${_commit}
build_style=gnu-configure
configure_args="--enable-malloc0returnsnull"
-hostmakedepends="automake libtool pkg-config xorg-util-macros git"
+hostmakedepends="automake libtool pkg-config xorg-util-macros"
makedepends="xorgproto libXfixes-devel libXext-devel libdrm-devel"
short_desc="Library for the DRI2 extension to the X Window System"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://github.com/robclark/libdri2"
+distfiles="${homepage}/archive/${_commit}.tar.gz"
+checksum=7c427f5c3fbda3d1df1dc77129e87605f4af1f3ad2adf2653c560d1703aa4395
provides="libdri2-1.0_1"
replaces="libdri2>=0"
-do_fetch() {
- git clone git://github.com/robclark/libdri2 ${pkgname}-${version}
-}
-
pre_configure() {
NOCONFIGURE=1 ./autogen.sh
}
+post_install() {
+ vlicense COPYING LICENSE
+}
+
libdri2-devel-git_package() {
short_desc+=" - development files"
depends="libX11-devel libXext-devel ${sourcepkg}>=${version}_${revision}"
From 85584c8a9ce1fa07355d40f7d1006955a78b1ee8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 4 Aug 2020 22:16:07 -0300
Subject: [PATCH 3/3] sunxi-mali: clean up, mark as nonfree.
---
srcpkgs/sunxi-mali/patches/make-tabs.patch | 29 ----------------------
srcpkgs/sunxi-mali/template | 27 +++++++++++++-------
2 files changed, 18 insertions(+), 38 deletions(-)
delete mode 100644 srcpkgs/sunxi-mali/patches/make-tabs.patch
diff --git a/srcpkgs/sunxi-mali/patches/make-tabs.patch b/srcpkgs/sunxi-mali/patches/make-tabs.patch
deleted file mode 100644
index 796dd3ae620..00000000000
--- a/srcpkgs/sunxi-mali/patches/make-tabs.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- lib/mali/Makefile.split.orig 2014-01-29 13:32:24.446817426 +0100
-+++ lib/mali/Makefile.split 2014-01-29 13:33:03.822133629 +0100
-@@ -1,16 +1,16 @@
- # Makefile for when everything is split up nicely.
-
- install: libMali.so libEGL.so.1.4 libGLESv1_CM.so.1.1 libGLESv2.so.2.0
-- $(INSTALL_DATA) $^ $(libdir)
-+ $(INSTALL_DATA) $^ $(libdir)
-
-- $(RM) $(libdir)libEGL.so.1 $(libdir)libEGL.so
-- $(LN) libEGL.so.1.4 $(libdir)libEGL.so.1
-- $(LN) libEGL.so.1 $(libdir)libEGL.so
-+ $(RM) $(libdir)libEGL.so.1 $(libdir)libEGL.so
-+ $(LN) libEGL.so.1.4 $(libdir)libEGL.so.1
-+ $(LN) libEGL.so.1 $(libdir)libEGL.so
-
-- $(RM) $(libdir)libGLESv1_CM.so.1 $(libdir)libGLESv1_CM.so
-- $(LN) libGLESv1_CM.so.1.1 $(libdir)libGLESv1_CM.so.1
-- $(LN) libGLESv1_CM.so.1 $(libdir)libGLESv1_CM.so
-+ $(RM) $(libdir)libGLESv1_CM.so.1 $(libdir)libGLESv1_CM.so
-+ $(LN) libGLESv1_CM.so.1.1 $(libdir)libGLESv1_CM.so.1
-+ $(LN) libGLESv1_CM.so.1 $(libdir)libGLESv1_CM.so
-
-- $(RM) $(libdir)libGLESv2.so.2 $(libdir)libGLESv2.so
-- $(LN) libGLESv2.so.2.0 $(libdir)libGLESv2.so.2
-- $(LN) libGLESv2.so.2 $(libdir)libGLESv2.so
-+ $(RM) $(libdir)libGLESv2.so.2 $(libdir)libGLESv2.so
-+ $(LN) libGLESv2.so.2.0 $(libdir)libGLESv2.so.2
-+ $(LN) libGLESv2.so.2 $(libdir)libGLESv2.so
diff --git a/srcpkgs/sunxi-mali/template b/srcpkgs/sunxi-mali/template
index 42b20a453a8..a3a234a132a 100644
--- a/srcpkgs/sunxi-mali/template
+++ b/srcpkgs/sunxi-mali/template
@@ -1,34 +1,43 @@
# Template file for 'sunxi-mali'
pkgname=sunxi-mali
version=20181122
-revision=1
+revision=2
+_commit=d343311efc8db166d8371b28494f0f27b6a58724
+_lib_commit=1c5063f43cdc9de341c0d63b2e3921cab86c7742
+archs="armv7l"
+create_wrksrc=yes
+build_wrksrc=${pkgname}-${_commit}
build_style=gnu-makefile
-hostmakedepends="git pkg-config perl"
+hostmakedepends="pkg-config perl"
makedepends="libXfixes-devel libump-git-devel libdri2-devel-git libdrm-devel"
short_desc="Linux sunxi MALI userpace propietary libraries"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://github.com/linux-sunxi/sunxi-mali"
-nostrip=yes
-archs="armv7l"
+distfiles="${homepage}/archive/${_commit}.tar.gz
+ https://github.com/linux-sunxi/sunxi-mali-proprietary/archive/${_lib_commit}.tar.gz"
+checksum="5ae27be532928667aa820a0aa9813dde545c224294b9402b27b6ca68f4d69ee4
+ f87d93629072dd0306ffe1200425188129e5f7f97750126dff38464ea707f673"
provides="libEGL-1.0_1 libGLES-1.0_1"
replaces="libEGL>=0 libGLES>=0"
+repository=nonfree
+nostrip=yes
-do_fetch() {
- git clone https://github.com/linux-sunxi/sunxi-mali.git ${wrksrc}
- cd ${wrksrc}
- git submodule init
- git submodule update
+post_extract() {
+ cp -r sunxi-mali-proprietary-${_lib_commit}/* ${pkgname}-${_commit}/lib/mali/
}
do_build() {
VERSION=r3p0 ABI=armhf EGL_TYPE=x11 make config
make ${makejobs}
+
+ sed -n '1,22p' version/version.c > LICENSE
}
do_install() {
vmkdir usr/lib
make DESTDIR=${DESTDIR} install
+ vlicense LICENSE
}
sunxi-mali-devel_package() {
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PR PATCH] [Updated] Clean up libdri2-git
2020-08-04 22:17 [PR PATCH] Remove libdri2-git ericonr
` (6 preceding siblings ...)
2020-09-20 15:22 ` ericonr
@ 2020-09-24 4:39 ` ericonr
2020-09-24 4:58 ` ericonr
2020-09-27 16:47 ` [PR PATCH] [Merged]: " ericonr
9 siblings, 0 replies; 11+ messages in thread
From: ericonr @ 2020-09-24 4:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 401 bytes --]
There is an updated pull request by ericonr against master on the void-packages repository
https://github.com/ericonr/void-packages libdri2
https://github.com/void-linux/void-packages/pull/24058
Clean up libdri2-git
Not sure how to test DRI2, but `xorg-server` itself seems to include all it needs for DRI2.
A patch file from https://github.com/void-linux/void-packages/pull/24058.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libdri2-24058.patch --]
[-- Type: text/x-diff, Size: 6891 bytes --]
From 892c1e4dcf4cfd21c82d2168d13ab6e0690a7875 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 4 Aug 2020 19:14:39 -0300
Subject: [PATCH 1/3] xorg-server: remove libdri2 from makedeps.
Obsolete.
---
srcpkgs/xorg-server/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 267b1f0cecf..4524831f1d7 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -1,7 +1,7 @@
# Template file for 'xorg-server'
pkgname=xorg-server
version=1.20.9
-revision=3
+revision=4
build_style=meson
configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
-Dxvfb=true -Dhal=false -Dudev=true -Dxkb_dir=/usr/share/X11/xkb
@@ -13,7 +13,7 @@ configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
hostmakedepends="pkg-config wayland-devel xkbcomp flex gzip"
makedepends="MesaLib-devel libXaw-devel libXfont-devel libXfont2-devel
libXrender-devel libXres-devel libXtst-devel libXv-devel libXxf86dga-devel
- libdmx-devel libdri2-devel-git libepoxy-devel libressl-devel libxkbfile-devel
+ libdmx-devel libepoxy-devel libressl-devel libxkbfile-devel
libxkbui-devel pixman-devel wayland-devel wayland-protocols
xcb-util-image-devel xcb-util-keysyms-devel xcb-util-renderutil-devel
xcb-util-wm-devel xkbcomp nettle-devel $(vopt_if elogind 'dbus-devel')"
From 54878f495a6ef71b8e253c35d90e89c99ce4b8df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 4 Aug 2020 19:15:02 -0300
Subject: [PATCH 2/3] libdri2-git: clean up package.
---
srcpkgs/libdri2-git/template | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/libdri2-git/template b/srcpkgs/libdri2-git/template
index 15299d525dc..60e0455aa8c 100644
--- a/srcpkgs/libdri2-git/template
+++ b/srcpkgs/libdri2-git/template
@@ -1,27 +1,31 @@
# Template file for 'libdri2-git'
pkgname=libdri2-git
version=20140317
-revision=2
+revision=3
+_commit=4f1eef3183df2b270c3d5cbef07343ee5127a6a4
+wrksrc=libdri2-${_commit}
build_style=gnu-configure
configure_args="--enable-malloc0returnsnull"
-hostmakedepends="automake libtool pkg-config xorg-util-macros git"
+hostmakedepends="automake libtool pkg-config xorg-util-macros"
makedepends="xorgproto libXfixes-devel libXext-devel libdrm-devel"
short_desc="Library for the DRI2 extension to the X Window System"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://github.com/robclark/libdri2"
+distfiles="${homepage}/archive/${_commit}.tar.gz"
+checksum=7c427f5c3fbda3d1df1dc77129e87605f4af1f3ad2adf2653c560d1703aa4395
provides="libdri2-1.0_1"
replaces="libdri2>=0"
-do_fetch() {
- git clone git://github.com/robclark/libdri2 ${pkgname}-${version}
-}
-
pre_configure() {
NOCONFIGURE=1 ./autogen.sh
}
+post_install() {
+ vlicense COPYING LICENSE
+}
+
libdri2-devel-git_package() {
short_desc+=" - development files"
depends="libX11-devel libXext-devel ${sourcepkg}>=${version}_${revision}"
From 3093dd771a0a2fca921dc0746502feab57fc5cc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 4 Aug 2020 22:16:07 -0300
Subject: [PATCH 3/3] sunxi-mali: clean up, mark as nonfree.
---
srcpkgs/sunxi-mali/patches/make-tabs.patch | 29 ----------------------
srcpkgs/sunxi-mali/template | 27 +++++++++++++-------
2 files changed, 18 insertions(+), 38 deletions(-)
delete mode 100644 srcpkgs/sunxi-mali/patches/make-tabs.patch
diff --git a/srcpkgs/sunxi-mali/patches/make-tabs.patch b/srcpkgs/sunxi-mali/patches/make-tabs.patch
deleted file mode 100644
index 796dd3ae620..00000000000
--- a/srcpkgs/sunxi-mali/patches/make-tabs.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- lib/mali/Makefile.split.orig 2014-01-29 13:32:24.446817426 +0100
-+++ lib/mali/Makefile.split 2014-01-29 13:33:03.822133629 +0100
-@@ -1,16 +1,16 @@
- # Makefile for when everything is split up nicely.
-
- install: libMali.so libEGL.so.1.4 libGLESv1_CM.so.1.1 libGLESv2.so.2.0
-- $(INSTALL_DATA) $^ $(libdir)
-+ $(INSTALL_DATA) $^ $(libdir)
-
-- $(RM) $(libdir)libEGL.so.1 $(libdir)libEGL.so
-- $(LN) libEGL.so.1.4 $(libdir)libEGL.so.1
-- $(LN) libEGL.so.1 $(libdir)libEGL.so
-+ $(RM) $(libdir)libEGL.so.1 $(libdir)libEGL.so
-+ $(LN) libEGL.so.1.4 $(libdir)libEGL.so.1
-+ $(LN) libEGL.so.1 $(libdir)libEGL.so
-
-- $(RM) $(libdir)libGLESv1_CM.so.1 $(libdir)libGLESv1_CM.so
-- $(LN) libGLESv1_CM.so.1.1 $(libdir)libGLESv1_CM.so.1
-- $(LN) libGLESv1_CM.so.1 $(libdir)libGLESv1_CM.so
-+ $(RM) $(libdir)libGLESv1_CM.so.1 $(libdir)libGLESv1_CM.so
-+ $(LN) libGLESv1_CM.so.1.1 $(libdir)libGLESv1_CM.so.1
-+ $(LN) libGLESv1_CM.so.1 $(libdir)libGLESv1_CM.so
-
-- $(RM) $(libdir)libGLESv2.so.2 $(libdir)libGLESv2.so
-- $(LN) libGLESv2.so.2.0 $(libdir)libGLESv2.so.2
-- $(LN) libGLESv2.so.2 $(libdir)libGLESv2.so
-+ $(RM) $(libdir)libGLESv2.so.2 $(libdir)libGLESv2.so
-+ $(LN) libGLESv2.so.2.0 $(libdir)libGLESv2.so.2
-+ $(LN) libGLESv2.so.2 $(libdir)libGLESv2.so
diff --git a/srcpkgs/sunxi-mali/template b/srcpkgs/sunxi-mali/template
index 42b20a453a8..a3a234a132a 100644
--- a/srcpkgs/sunxi-mali/template
+++ b/srcpkgs/sunxi-mali/template
@@ -1,34 +1,43 @@
# Template file for 'sunxi-mali'
pkgname=sunxi-mali
version=20181122
-revision=1
+revision=2
+_commit=d343311efc8db166d8371b28494f0f27b6a58724
+_lib_commit=1c5063f43cdc9de341c0d63b2e3921cab86c7742
+archs="armv7l"
+create_wrksrc=yes
+build_wrksrc=${pkgname}-${_commit}
build_style=gnu-makefile
-hostmakedepends="git pkg-config perl"
+hostmakedepends="pkg-config perl"
makedepends="libXfixes-devel libump-git-devel libdri2-devel-git libdrm-devel"
short_desc="Linux sunxi MALI userpace propietary libraries"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://github.com/linux-sunxi/sunxi-mali"
-nostrip=yes
-archs="armv7l"
+distfiles="${homepage}/archive/${_commit}.tar.gz
+ https://github.com/linux-sunxi/sunxi-mali-proprietary/archive/${_lib_commit}.tar.gz"
+checksum="5ae27be532928667aa820a0aa9813dde545c224294b9402b27b6ca68f4d69ee4
+ f87d93629072dd0306ffe1200425188129e5f7f97750126dff38464ea707f673"
provides="libEGL-1.0_1 libGLES-1.0_1"
replaces="libEGL>=0 libGLES>=0"
+repository=nonfree
+nostrip=yes
-do_fetch() {
- git clone https://github.com/linux-sunxi/sunxi-mali.git ${wrksrc}
- cd ${wrksrc}
- git submodule init
- git submodule update
+post_extract() {
+ cp -r sunxi-mali-proprietary-${_lib_commit}/* ${pkgname}-${_commit}/lib/mali/
}
do_build() {
VERSION=r3p0 ABI=armhf EGL_TYPE=x11 make config
make ${makejobs}
+
+ sed -n '1,22p' version/version.c > LICENSE
}
do_install() {
vmkdir usr/lib
make DESTDIR=${DESTDIR} install
+ vlicense LICENSE
}
sunxi-mali-devel_package() {
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PR PATCH] [Updated] Clean up libdri2-git
2020-08-04 22:17 [PR PATCH] Remove libdri2-git ericonr
` (7 preceding siblings ...)
2020-09-24 4:39 ` ericonr
@ 2020-09-24 4:58 ` ericonr
2020-09-27 16:47 ` [PR PATCH] [Merged]: " ericonr
9 siblings, 0 replies; 11+ messages in thread
From: ericonr @ 2020-09-24 4:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 401 bytes --]
There is an updated pull request by ericonr against master on the void-packages repository
https://github.com/ericonr/void-packages libdri2
https://github.com/void-linux/void-packages/pull/24058
Clean up libdri2-git
Not sure how to test DRI2, but `xorg-server` itself seems to include all it needs for DRI2.
A patch file from https://github.com/void-linux/void-packages/pull/24058.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libdri2-24058.patch --]
[-- Type: text/x-diff, Size: 7135 bytes --]
From 84c3b8cc2c7b07337bd95997e3b8018639a61220 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 4 Aug 2020 19:14:39 -0300
Subject: [PATCH 1/3] xorg-server: remove libdri2 from makedeps, orphan.
Obsolete. This doesn't change the build in any way, so no need to revbump.
---
srcpkgs/xorg-server/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 267b1f0cecf..1d13f877f04 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -13,7 +13,7 @@ configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
hostmakedepends="pkg-config wayland-devel xkbcomp flex gzip"
makedepends="MesaLib-devel libXaw-devel libXfont-devel libXfont2-devel
libXrender-devel libXres-devel libXtst-devel libXv-devel libXxf86dga-devel
- libdmx-devel libdri2-devel-git libepoxy-devel libressl-devel libxkbfile-devel
+ libdmx-devel libepoxy-devel libressl-devel libxkbfile-devel
libxkbui-devel pixman-devel wayland-devel wayland-protocols
xcb-util-image-devel xcb-util-keysyms-devel xcb-util-renderutil-devel
xcb-util-wm-devel xkbcomp nettle-devel $(vopt_if elogind 'dbus-devel')"
@@ -21,7 +21,7 @@ makedepends="MesaLib-devel libXaw-devel libXfont-devel libXfont2-devel
depends="xkeyboard-config $(vopt_if elogind 'elogind')"
checkdepends="xkeyboard-config"
short_desc="X11 server from X.org"
-maintainer="Juan RP <xtraeme@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT, BSD-3-Clause"
homepage="https://xorg.freedesktop.org"
distfiles="${XORG_SITE}/xserver/${pkgname}-${version}.tar.bz2"
From de3a9edfebae349f53dd08b494bc7f535d481453 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 4 Aug 2020 19:15:02 -0300
Subject: [PATCH 2/3] libdri2-git: clean up package.
---
srcpkgs/libdri2-git/template | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/libdri2-git/template b/srcpkgs/libdri2-git/template
index 15299d525dc..60e0455aa8c 100644
--- a/srcpkgs/libdri2-git/template
+++ b/srcpkgs/libdri2-git/template
@@ -1,27 +1,31 @@
# Template file for 'libdri2-git'
pkgname=libdri2-git
version=20140317
-revision=2
+revision=3
+_commit=4f1eef3183df2b270c3d5cbef07343ee5127a6a4
+wrksrc=libdri2-${_commit}
build_style=gnu-configure
configure_args="--enable-malloc0returnsnull"
-hostmakedepends="automake libtool pkg-config xorg-util-macros git"
+hostmakedepends="automake libtool pkg-config xorg-util-macros"
makedepends="xorgproto libXfixes-devel libXext-devel libdrm-devel"
short_desc="Library for the DRI2 extension to the X Window System"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://github.com/robclark/libdri2"
+distfiles="${homepage}/archive/${_commit}.tar.gz"
+checksum=7c427f5c3fbda3d1df1dc77129e87605f4af1f3ad2adf2653c560d1703aa4395
provides="libdri2-1.0_1"
replaces="libdri2>=0"
-do_fetch() {
- git clone git://github.com/robclark/libdri2 ${pkgname}-${version}
-}
-
pre_configure() {
NOCONFIGURE=1 ./autogen.sh
}
+post_install() {
+ vlicense COPYING LICENSE
+}
+
libdri2-devel-git_package() {
short_desc+=" - development files"
depends="libX11-devel libXext-devel ${sourcepkg}>=${version}_${revision}"
From 3a1526b0a090bcaa47a42b28c48aa8f131e9cd45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 4 Aug 2020 22:16:07 -0300
Subject: [PATCH 3/3] sunxi-mali: clean up, mark as nonfree.
---
srcpkgs/sunxi-mali/patches/make-tabs.patch | 29 ----------------------
srcpkgs/sunxi-mali/template | 27 +++++++++++++-------
2 files changed, 18 insertions(+), 38 deletions(-)
delete mode 100644 srcpkgs/sunxi-mali/patches/make-tabs.patch
diff --git a/srcpkgs/sunxi-mali/patches/make-tabs.patch b/srcpkgs/sunxi-mali/patches/make-tabs.patch
deleted file mode 100644
index 796dd3ae620..00000000000
--- a/srcpkgs/sunxi-mali/patches/make-tabs.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- lib/mali/Makefile.split.orig 2014-01-29 13:32:24.446817426 +0100
-+++ lib/mali/Makefile.split 2014-01-29 13:33:03.822133629 +0100
-@@ -1,16 +1,16 @@
- # Makefile for when everything is split up nicely.
-
- install: libMali.so libEGL.so.1.4 libGLESv1_CM.so.1.1 libGLESv2.so.2.0
-- $(INSTALL_DATA) $^ $(libdir)
-+ $(INSTALL_DATA) $^ $(libdir)
-
-- $(RM) $(libdir)libEGL.so.1 $(libdir)libEGL.so
-- $(LN) libEGL.so.1.4 $(libdir)libEGL.so.1
-- $(LN) libEGL.so.1 $(libdir)libEGL.so
-+ $(RM) $(libdir)libEGL.so.1 $(libdir)libEGL.so
-+ $(LN) libEGL.so.1.4 $(libdir)libEGL.so.1
-+ $(LN) libEGL.so.1 $(libdir)libEGL.so
-
-- $(RM) $(libdir)libGLESv1_CM.so.1 $(libdir)libGLESv1_CM.so
-- $(LN) libGLESv1_CM.so.1.1 $(libdir)libGLESv1_CM.so.1
-- $(LN) libGLESv1_CM.so.1 $(libdir)libGLESv1_CM.so
-+ $(RM) $(libdir)libGLESv1_CM.so.1 $(libdir)libGLESv1_CM.so
-+ $(LN) libGLESv1_CM.so.1.1 $(libdir)libGLESv1_CM.so.1
-+ $(LN) libGLESv1_CM.so.1 $(libdir)libGLESv1_CM.so
-
-- $(RM) $(libdir)libGLESv2.so.2 $(libdir)libGLESv2.so
-- $(LN) libGLESv2.so.2.0 $(libdir)libGLESv2.so.2
-- $(LN) libGLESv2.so.2 $(libdir)libGLESv2.so
-+ $(RM) $(libdir)libGLESv2.so.2 $(libdir)libGLESv2.so
-+ $(LN) libGLESv2.so.2.0 $(libdir)libGLESv2.so.2
-+ $(LN) libGLESv2.so.2 $(libdir)libGLESv2.so
diff --git a/srcpkgs/sunxi-mali/template b/srcpkgs/sunxi-mali/template
index 42b20a453a8..a3a234a132a 100644
--- a/srcpkgs/sunxi-mali/template
+++ b/srcpkgs/sunxi-mali/template
@@ -1,34 +1,43 @@
# Template file for 'sunxi-mali'
pkgname=sunxi-mali
version=20181122
-revision=1
+revision=2
+_commit=d343311efc8db166d8371b28494f0f27b6a58724
+_lib_commit=1c5063f43cdc9de341c0d63b2e3921cab86c7742
+archs="armv7l"
+create_wrksrc=yes
+build_wrksrc=${pkgname}-${_commit}
build_style=gnu-makefile
-hostmakedepends="git pkg-config perl"
+hostmakedepends="pkg-config perl"
makedepends="libXfixes-devel libump-git-devel libdri2-devel-git libdrm-devel"
short_desc="Linux sunxi MALI userpace propietary libraries"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://github.com/linux-sunxi/sunxi-mali"
-nostrip=yes
-archs="armv7l"
+distfiles="${homepage}/archive/${_commit}.tar.gz
+ https://github.com/linux-sunxi/sunxi-mali-proprietary/archive/${_lib_commit}.tar.gz"
+checksum="5ae27be532928667aa820a0aa9813dde545c224294b9402b27b6ca68f4d69ee4
+ f87d93629072dd0306ffe1200425188129e5f7f97750126dff38464ea707f673"
provides="libEGL-1.0_1 libGLES-1.0_1"
replaces="libEGL>=0 libGLES>=0"
+repository=nonfree
+nostrip=yes
-do_fetch() {
- git clone https://github.com/linux-sunxi/sunxi-mali.git ${wrksrc}
- cd ${wrksrc}
- git submodule init
- git submodule update
+post_extract() {
+ cp -r sunxi-mali-proprietary-${_lib_commit}/* ${pkgname}-${_commit}/lib/mali/
}
do_build() {
VERSION=r3p0 ABI=armhf EGL_TYPE=x11 make config
make ${makejobs}
+
+ sed -n '1,22p' version/version.c > LICENSE
}
do_install() {
vmkdir usr/lib
make DESTDIR=${DESTDIR} install
+ vlicense LICENSE
}
sunxi-mali-devel_package() {
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PR PATCH] [Merged]: Clean up libdri2-git
2020-08-04 22:17 [PR PATCH] Remove libdri2-git ericonr
` (8 preceding siblings ...)
2020-09-24 4:58 ` ericonr
@ 2020-09-27 16:47 ` ericonr
9 siblings, 0 replies; 11+ messages in thread
From: ericonr @ 2020-09-27 16:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 245 bytes --]
There's a merged pull request on the void-packages repository
Clean up libdri2-git
https://github.com/void-linux/void-packages/pull/24058
Description:
Not sure how to test DRI2, but `xorg-server` itself seems to include all it needs for DRI2.
^ permalink raw reply [flat|nested] 11+ messages in thread