Date: Sunday, January 9, 2022 @ 17:15:57
Author: lcarlier
Revision: 434056
upgpkg: glu 9.0.2-2: fix pkgconfig file
Added:
glu/trunk/0001-pkgconfig-Depend-on-opengl-when-built-with-libglvnd.patch
glu/trunk/0002-pkgconfig-Drop-unneeded-lines-from-autotools-build.patch
glu/trunk/0003-pkgconfig-meson-build-should-match-autotools-require.patch
Modified:
glu/trunk/PKGBUILD
-----------------------------------------------------------------+
0001-pkgconfig-Depend-on-opengl-when-built-with-libglvnd.patch | 26 ++++++++
0002-pkgconfig-Drop-unneeded-lines-from-autotools-build.patch | 29
++++++++++
0003-pkgconfig-meson-build-should-match-autotools-require.patch | 23 +++++++
PKGBUILD | 21 ++++++-
4 files changed, 96 insertions(+), 3 deletions(-)
Added: 0001-pkgconfig-Depend-on-opengl-when-built-with-libglvnd.patch
===================================================================
--- 0001-pkgconfig-Depend-on-opengl-when-built-with-libglvnd.patch
(rev 0)
+++ 0001-pkgconfig-Depend-on-opengl-when-built-with-libglvnd.patch
2022-01-09 17:15:57 UTC (rev 434056)
@@ -0,0 +1,26 @@
+From dfeb6ed02a23517e1062e52acd3cd322e1a16ffc Mon Sep 17 00:00:00 2001
+From: Kevin Bowling <kevin.bowl...@kev009.com>
+Date: Wed, 7 Jul 2021 22:16:12 -0700
+Subject: [PATCH 1/3] pkgconfig: Depend on opengl when built with libglvnd
+
+Signed-off-by: Laurent Carlier <lordhea...@gmail.com>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 14150f0..ef4d473 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -73,7 +73,7 @@ AC_ARG_ENABLE(osmesa,
+ dnl Get the pkg-config definitions for libglvnd/OSMesa/libGL. We include a
+ dnl fallback path for implementations that don't provide a .pc file
+ AS_IF([test "x$LIBGLVND" = "xyes"], [
+- GLU_REQUIRES="libglvnd"
++ GLU_REQUIRES="opengl"
+ PKG_CHECK_MODULES(LIBGLVND, [opengl], [], [
+ AC_CHECK_HEADER([GL/gl.h],
+ [],
+--
+2.34.1
+
Added: 0002-pkgconfig-Drop-unneeded-lines-from-autotools-build.patch
===================================================================
--- 0002-pkgconfig-Drop-unneeded-lines-from-autotools-build.patch
(rev 0)
+++ 0002-pkgconfig-Drop-unneeded-lines-from-autotools-build.patch
2022-01-09 17:15:57 UTC (rev 434056)
@@ -0,0 +1,29 @@
+From f6b4103e237cea8c924c307ccc8f1881921d90d0 Mon Sep 17 00:00:00 2001
+From: Kevin Bowling <kevin.bowl...@kev009.com>
+Date: Thu, 8 Jul 2021 21:51:34 -0700
+Subject: [PATCH 2/3] pkgconfig: Drop unneeded lines from autotools build
+
+Signed-off-by: Laurent Carlier <lordhea...@gmail.com>
+---
+ glu.pc.in | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/glu.pc.in b/glu.pc.in
+index 8bb957a..9f1425c 100644
+--- a/glu.pc.in
++++ b/glu.pc.in
+@@ -1,5 +1,4 @@
+ prefix=@prefix@
+-exec_prefix=${prefix}
+ libdir=@libdir@
+ includedir=@includedir@
+
+@@ -8,5 +7,4 @@ Description: Mesa OpenGL Utility library
+ Requires: @GLU_REQUIRES@
+ Version: @VERSION@
+ Libs: -L${libdir} -lGLU
+-Libs.private: -lm
+ Cflags: -I${includedir}
+--
+2.34.1
+
Added: 0003-pkgconfig-meson-build-should-match-autotools-require.patch
===================================================================
--- 0003-pkgconfig-meson-build-should-match-autotools-require.patch
(rev 0)
+++ 0003-pkgconfig-meson-build-should-match-autotools-require.patch
2022-01-09 17:15:57 UTC (rev 434056)
@@ -0,0 +1,23 @@
+From 225e00a14a9200f11253775a7c7778c1c29c8b23 Mon Sep 17 00:00:00 2001
+From: Kevin Bowling <kevin.bowl...@kev009.com>
+Date: Thu, 8 Jul 2021 22:05:12 -0700
+Subject: [PATCH 3/3] pkgconfig: meson build should match autotools requires
+
+Signed-off-by: Laurent Carlier <lordhea...@gmail.com>
+---
+ meson.build | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/meson.build b/meson.build
+index cffa7f8..536fbef 100644
+--- a/meson.build
++++ b/meson.build
+@@ -34,4 +34,5 @@ pkgconf.generate(
+ libglu,
+ name : 'glu',
+ description : 'Mesa OpenGL Utility Library',
++ requires: dep_gl
+ )
+--
+2.34.1
+
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2022-01-09 15:59:33 UTC (rev 434055)
+++ PKGBUILD 2022-01-09 17:15:57 UTC (rev 434056)
@@ -3,7 +3,7 @@
pkgname=glu
pkgver=9.0.2
-pkgrel=1
+pkgrel=2
pkgdesc="Mesa OpenGL Utility library"
arch=('x86_64')
url="https://cgit.freedesktop.org/mesa/glu/";
@@ -10,11 +10,26 @@
license=('LGPL')
depends=('libgl')
makedepends=('meson')
-source=(https://mesa.freedesktop.org/archive/$pkgname/$pkgname-$pkgver.tar.xz{,.sig})
+source=(https://mesa.freedesktop.org/archive/$pkgname/$pkgname-$pkgver.tar.xz{,.sig}
+ 0001-pkgconfig-Depend-on-opengl-when-built-with-libglvnd.patch
+ 0002-pkgconfig-Drop-unneeded-lines-from-autotools-build.patch
+ 0003-pkgconfig-meson-build-should-match-autotools-require.patch)
sha512sums=('2517d7406bb643d12c017a95dcb5d8716f307344332638bcbdf274a90752a7c22165d34745f1b082ed916bb07d40e62d1d1d67d96426225be63166f3480d6f64'
- 'SKIP')
+ 'SKIP'
+
'c6fe65e9505c37f94f6c136dc1ad5aac62828bb0d60d7cf887743521ba030b64c63111713c54c77480b79d9fa0fe9424074c59b391ec385b6ed2867cf03e5128'
+
'132184fd813c20a5dcd5357bb651e42f9df9bd8ed5d6cfe60e0956d74854863210bdf5a498f5f0c60122cafb34389bc4c4d288c66d793c4be11ab25781c44881'
+
'972518b5363c7768655ae7a18d31faf42ebeae8be3408edbebbe021b17300cec366b091b82c880422052ba469ec6569ecb07b0741b2560822c578e13dce8c098')
validpgpkeys=('3BB639E56F861FA2E86505690FDD682D974CA72A') # "Matt Turner
<matts...@gmail.com>"
+prepare() {
+ cd $pkgname-$pkgver
+
+ # merged upstream
+ patch -Np1 -i
../0001-pkgconfig-Depend-on-opengl-when-built-with-libglvnd.patch
+ patch -Np1 -i
../0002-pkgconfig-Drop-unneeded-lines-from-autotools-build.patch
+ patch -Np1 -i
../0003-pkgconfig-meson-build-should-match-autotools-require.patch
+}
+
build() {
arch-meson $pkgname-$pkgver build \
-D default_library=shared
