forked from pool/cuarzo-srm
Accepting request 1135319 from X11:Wayland
Automatic submission by obs-autosubmit OBS-URL: https://build.opensuse.org/request/show/1135319 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cuarzo-srm?expand=0&rev=2
This commit is contained in:
Ana Guerrero
Git OBS Bridge
commit
17c406b60f
@ -1,67 +0,0 @@
|
||||
From 6e684612c648275c532b374e917c60388513c35c Mon Sep 17 00:00:00 2001
|
||||
From: Jan Engelhardt <jengelh@inai.de>
|
||||
Date: Sat, 18 Nov 2023 10:51:11 +0100
|
||||
Subject: [PATCH] build: heed results from pkg-config
|
||||
References: https://github.com/CuarzoSoftware/SRM/pull/7
|
||||
|
||||
The .pc files can have extra required flags or locations (e.g. if
|
||||
libraries are installed outside the standard search paths).
|
||||
---
|
||||
doxygen/md/Tutorial.md | 4 ++--
|
||||
src/meson.build | 17 +++++++++--------
|
||||
2 files changed, 11 insertions(+), 10 deletions(-)
|
||||
|
||||
diff --git a/doxygen/md/Tutorial.md b/doxygen/md/Tutorial.md
|
||||
index b25fe71..88c49bb 100644
|
||||
--- a/doxygen/md/Tutorial.md
|
||||
+++ b/doxygen/md/Tutorial.md
|
||||
@@ -21,8 +21,8 @@ project('srm-example',
|
||||
version : '0.1.0')
|
||||
|
||||
c = meson.get_compiler('c')
|
||||
-
|
||||
-glesv2_dep = c.find_library('GLESv2')
|
||||
+pkg = import('pkgconfig')
|
||||
+glesv2_dep = dependency('glesv2')
|
||||
srm_dep = c.find_library('SRM')
|
||||
|
||||
include_directories_filtered = []
|
||||
diff --git a/src/meson.build b/src/meson.build
|
||||
index c734fbe..e3cc862 100644
|
||||
--- a/src/meson.build
|
||||
+++ b/src/meson.build
|
||||
@@ -56,13 +56,14 @@ endforeach
|
||||
|
||||
# ------------ DEPENDENCIES ------------
|
||||
|
||||
-egl_dep = c.find_library('EGL')
|
||||
-glesv2_dep = c.find_library('GLESv2')
|
||||
-udev_dep = c.find_library('udev')
|
||||
+pkg = import('pkgconfig')
|
||||
+egl_dep = dependency('egl')
|
||||
+glesv2_dep = dependency('glesv2')
|
||||
+udev_dep = dependency('libudev')
|
||||
pthread_dep = c.find_library('pthread')
|
||||
-drm_dep = c.find_library('drm')
|
||||
-gbm_dep = c.find_library('gbm')
|
||||
-display_info_dep = c.find_library('display-info')
|
||||
+drm_dep = dependency('libdrm')
|
||||
+gbm_dep = dependency('gbm')
|
||||
+display_info_dep = dependency('libdisplay-info')
|
||||
|
||||
# ------------ SOURCE CODE FILES ------------
|
||||
|
||||
@@ -95,8 +96,8 @@ endif
|
||||
|
||||
if get_option('build_examples')
|
||||
m_dep = c.find_library('m')
|
||||
- libinput_dep = c.find_library('input')
|
||||
- libseat_dep = c.find_library('seat')
|
||||
+ libinput_dep = dependency('libinput')
|
||||
+ libseat_dep = dependency('libseat')
|
||||
|
||||
subdir('examples/srm-basic')
|
||||
subdir('examples/srm-display-info')
|
||||
--
|
||||
2.42.1
|
||||
|
||||
@ -1,39 +0,0 @@
|
||||
From 093d56c4894e447609dc93d100a0b61a48f178e3 Mon Sep 17 00:00:00 2001
|
||||
From: Jan Engelhardt <jengelh@inai.de>
|
||||
Date: Sat, 18 Nov 2023 11:03:08 +0100
|
||||
Subject: [PATCH] build: import "gl" dependency
|
||||
References: https://github.com/CuarzoSoftware/SRM/pull/8
|
||||
|
||||
[ 3s] ../lib/SRMBuffer.c:1:10: fatal error: GL/gl.h: No such file or directory
|
||||
|
||||
Looking for the GLESv2 component is not enough to ensure gl.h exists.
|
||||
The Mesa packages considers them to be separate entities (because different
|
||||
.pc files), and distributions readily split Mesa into individually-installable
|
||||
libGL and libGLESv2 components, too.
|
||||
---
|
||||
src/meson.build | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/src/meson.build b/src/meson.build
|
||||
index e3cc862..e710f12 100644
|
||||
--- a/src/meson.build
|
||||
+++ b/src/meson.build
|
||||
@@ -57,6 +57,7 @@ endforeach
|
||||
# ------------ DEPENDENCIES ------------
|
||||
|
||||
pkg = import('pkgconfig')
|
||||
+gl_dep = dependency('gl')
|
||||
egl_dep = dependency('egl')
|
||||
glesv2_dep = dependency('glesv2')
|
||||
udev_dep = dependency('libudev')
|
||||
@@ -77,6 +78,7 @@ SRM = library(
|
||||
dependencies : [
|
||||
display_info_dep,
|
||||
egl_dep,
|
||||
+ gl_dep,
|
||||
glesv2_dep,
|
||||
udev_dep,
|
||||
pthread_dep,
|
||||
--
|
||||
2.42.1
|
||||
|
||||
@ -1,24 +0,0 @@
|
||||
From f4bdb3557fa382e13eb396f4e7a766325cf53544 Mon Sep 17 00:00:00 2001
|
||||
From: Jan Engelhardt <jengelh@inai.de>
|
||||
Date: Sat, 18 Nov 2023 12:04:08 +0100
|
||||
|
||||
Unversioned libraries suck.
|
||||
---
|
||||
src/meson.build | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/src/meson.build b/src/meson.build
|
||||
index e710f12..427b423 100644
|
||||
--- a/src/meson.build
|
||||
+++ b/src/meson.build
|
||||
@@ -75,6 +75,7 @@ SRM = library(
|
||||
'SRM',
|
||||
sources : sources,
|
||||
include_directories : include_paths,
|
||||
+ soversion: 'suse0',
|
||||
dependencies : [
|
||||
display_info_dep,
|
||||
egl_dep,
|
||||
--
|
||||
2.42.1
|
||||
|
||||
@ -1,4 +1,18 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Dec 20 13:16:55 UTC 2023 - Jan Engelhardt <jengelh@inai.de>
|
||||
|
||||
- Update to release 0.4.0.1
|
||||
* Introduced srmPlaneGetFormats() to retrieve the supported
|
||||
formats/modifiers of an SRMPlane.
|
||||
* Implemented srmDeviceGetGLExtensions() for checking the
|
||||
support of common OpenGL extensions.
|
||||
* Added srmCoreGetVersion() to retrieve the current SRM version.
|
||||
- Delete 0001-build-heed-results-from-pkg-config.patch,
|
||||
0001-build-import-gl-dependency.patch, 0001-versioning.patch.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Nov 18 10:34:16 UTC 2023 - Jan Engelhardt <jengelh@inai.de>
|
||||
|
||||
- Initial version 0.3.2.1
|
||||
- Add 0001-build-heed-results-from-pkg-config.patch,
|
||||
0001-build-import-gl-dependency.patch, 0001-versioning.patch.
|
||||
|
||||
@ -17,18 +17,15 @@
|
||||
|
||||
|
||||
Name: cuarzo-srm
|
||||
Version: 0.3.2.1
|
||||
%define sillyver 0.3.2-1
|
||||
%define lname libSRM-suse0
|
||||
Version: 0.4.0.1
|
||||
%define sillyver 0.4.0-1
|
||||
%define lname libSRM0
|
||||
Release: 0
|
||||
Summary: Rendering manager for the Louvre library
|
||||
License: GPL-3.0-only
|
||||
Group: Development/Libraries/C and C++
|
||||
URL: https://github.com/CuarzoSoftware/SRM/
|
||||
Source: https://github.com/CuarzoSoftware/SRM/archive/refs/tags/v%sillyver.tar.gz
|
||||
Patch1: 0001-build-heed-results-from-pkg-config.patch
|
||||
Patch2: 0001-build-import-gl-dependency.patch
|
||||
Patch3: 0001-versioning.patch
|
||||
BuildRequires: c_compiler
|
||||
BuildRequires: meson
|
||||
BuildRequires: pkgconfig(egl)
|
||||
@ -86,12 +83,13 @@ popd
|
||||
%postun -n %lname -p /sbin/ldconfig
|
||||
|
||||
%files -n %lname
|
||||
%_libdir/libSRM.so.suse0
|
||||
%_libdir/libSRM.so.*
|
||||
|
||||
%files devel
|
||||
%license LICENSE
|
||||
%_bindir/srm-*
|
||||
%_includedir/SRM/
|
||||
%_libdir/libSRM.so
|
||||
%_libdir/pkgconfig/*.pc
|
||||
|
||||
%changelog
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:89e9d754a794b6abdf75b751d6f2b91b1954bdfdb9399c46ca674bb421964018
|
||||
size 139632
|
||||
3
v0.4.0-1.tar.gz
Normal file
3
v0.4.0-1.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:d453770049947be9135cbfcf5a6d2d32e3dfb1b56a31004505e8ff35d5858999
|
||||
size 129597
|
||||
Loading…
x
Reference in New Issue
Block a user