From: ericonr <ericonr@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] Clean up libdri2-git
Date: Wed, 05 Aug 2020 04:59:21 +0200 [thread overview]
Message-ID: <20200805025921.QFngO7P5n0SXV1ptyMftdr7oiUMqRfQI8yMVIDfPNkk@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-24058@inbox.vuxu.org>
[-- 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() {
next prev parent reply other threads:[~2020-08-05 2:59 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
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 [this message]
2020-08-05 3:20 ` ericonr
2020-08-07 2:45 ` ericonr
2020-08-31 16:56 ` ericonr
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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200805025921.QFngO7P5n0SXV1ptyMftdr7oiUMqRfQI8yMVIDfPNkk@z \
--to=ericonr@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).