FS#72107 - [lib32-sdl2] pkgconfig file, libdir points to /usr/lib instead of /usr/lib32
Attached to Project:
Community Packages
Opened by Gustavo Alvarez (sl1pkn07) - Saturday, 11 September 2021, 19:00 GMT
Last edited by Maxime Gauduin (Alucryd) - Wednesday, 19 January 2022, 10:06 GMT
Opened by Gustavo Alvarez (sl1pkn07) - Saturday, 11 September 2021, 19:00 GMT
Last edited by Maxime Gauduin (Alucryd) - Wednesday, 19 January 2022, 10:06 GMT
|
Details
Description:
into the pkgconfig file, libdir poins to libdir=/usr/lib instead of libdir=/usr/lib32 └───╼ cat /usr/lib32/pkgconfig/sdl2.pc # sdl pkg-config source file prefix=/usr exec_prefix=${prefix} libdir=/usr/lib includedir=/usr/include Name: sdl2 Description: Simple DirectMedia Layer is a cross-platform multimedia library designed to provide low level access to audio, keyboard, mouse, joystick, 3D hardware via OpenGL, and 2D video framebuffer. Version: 2.0.16 Requires: Conflicts: Libs: -L${libdir} -pthread -lSDL2 Libs.private: -lrt -lunwind-generic -lunwind -ldbus-1 -ldl -lm -Wl,--no-undefined -Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now -pthread -lSDL2 Cflags: -I${includedir}/SDL2 -D_REENTRANT greetings |
This task depends upon
Closed by Maxime Gauduin (Alucryd)
Wednesday, 19 January 2022, 10:06 GMT
Reason for closing: Fixed
Additional comments about closing: 2.0.20-1
Wednesday, 19 January 2022, 10:06 GMT
Reason for closing: Fixed
Additional comments about closing: 2.0.20-1
patch
~~~
diff --git a/trunk/PKGBUILD b/trunk/PKGBUILD
index 3408b843..aaf88c59 100644
--- a/trunk/PKGBUILD
+++ b/trunk/PKGBUILD
@@ -4,7 +4,7 @@
pkgname=lib32-sdl2
pkgver=2.0.16
-pkgrel=1
+pkgrel=2
pkgdesc='A library for portable low-level access to a video framebuffer, audio output, mouse, and keyboard'
arch=(x86_64)
url=https://www.libsdl.org
@@ -37,9 +37,12 @@ optdepends=(
'lib32-libpulse: PulseAudio audio driver'
'lib32-jack: JACK audio driver'
)
-_tag=25f9ed87ff6947d9576fc9d79dee0784e638ac58
-source=(git+https://github.com/libsdl-org/SDL.git#tag=${_tag})
-sha512sums=(SKIP)
+source=(git+https://github.com/libsdl-org/SDL.git#tag=release-${pkgver}
+https://github.com/libsdl-org/SDL/commit/aa0b47debadad2116dd84852392bf64a61316d20.diff
+)
+sha512sums=('SKIP'
+ 'b65197c396e58f9aca6e51128706f04176e37d319de8161cb966d6952163038890d09fb2134c70f2e81b5fd0a68f8f7eec355fe59968db8aec6932ad87f4c2a4')
+
pkgver() {
cd SDL
@@ -48,8 +51,9 @@ pkgver() {
}
prepare() {
- # fix libdir
- sed -i 's|lib/cmake|lib32/cmake|' SDL/CMakeLists.txt
+
+ patch -d SDL -p1 -i "${srcdir}"/aa0b47debadad2116dd84852392bf64a61316d20.diff
+
# Don't try to link against ibus
sed -i '/pkg_search_module.*ibus-1.0/d' SDL/CMakeLists.txt
}
@@ -61,7 +65,7 @@ build() {
cmake -S SDL -B build \
-DCMAKE_INSTALL_PREFIX=/usr \
- -DLIB_SUFFIX=32 \
+ -DCMAKE_INSTALL_LIBDIR=lib32 \
-DSDL_STATIC=OFF \
-DSDL_DLOPEN=ON \
-DARTS=OFF \
~~~
~~~