From 06aa8d70999f46cab146022ce65ec82f5e5a2f41 Mon Sep 17 00:00:00 2001 From: "A. Wilcox" Date: Fri, 3 Jan 2020 17:36:31 +0000 Subject: user/sdl2: Fix sdl2-config/.pc --- user/sdl2/APKBUILD | 7 +++++-- user/sdl2/sdl2-soname.patch | 13 +++++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 user/sdl2/sdl2-soname.patch (limited to 'user/sdl2') diff --git a/user/sdl2/APKBUILD b/user/sdl2/APKBUILD index d9926687a..36e3ee8bf 100644 --- a/user/sdl2/APKBUILD +++ b/user/sdl2/APKBUILD @@ -13,7 +13,9 @@ makedepends="alsa-lib-dev libx11-dev libxcursor-dev libxext-dev libxi-dev libxkbcommon-dev libxrandr-dev libxrender-dev libusb-dev mesa-dev libxscrnsaver-dev dbus-dev eudev-dev pulseaudio-dev cmake" subpackages="$pkgname-dev" -source="https://www.libsdl.org/release/SDL2-$pkgver.tar.gz" +source="https://www.libsdl.org/release/SDL2-$pkgver.tar.gz + sdl2-soname.patch + " builddir="$srcdir/SDL2-$pkgver" build() { @@ -35,4 +37,5 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="f49b869362699b3282f6e82920e59c7fac581bcbf955f18a81cc126293c08093a90df7fcb39517cc8bc32708d2213fe645a42b655d6d811c1386efebb3d3c798 SDL2-2.0.10.tar.gz" +sha512sums="f49b869362699b3282f6e82920e59c7fac581bcbf955f18a81cc126293c08093a90df7fcb39517cc8bc32708d2213fe645a42b655d6d811c1386efebb3d3c798 SDL2-2.0.10.tar.gz +23fbb178730f0955732cbb3a61145e7ec1bf7810a2589c259cd715557cb4ff5bcbc676197db375ad31be46dab93c6ea7e06b3549414205ae56e1b65a8c8ab21a sdl2-soname.patch" diff --git a/user/sdl2/sdl2-soname.patch b/user/sdl2/sdl2-soname.patch new file mode 100644 index 000000000..8f040e30c --- /dev/null +++ b/user/sdl2/sdl2-soname.patch @@ -0,0 +1,13 @@ +The library name is SDL2-2.0, not SDL2. This fixes builds against SDL. + +--- SDL2-2.0.10/CMakeLists.txt.old 2019-07-25 04:32:36.000000000 +0000 ++++ SDL2-2.0.10/CMakeLists.txt 2020-01-03 17:23:42.451699149 +0000 +@@ -224,7 +224,7 @@ + + # Those are used for pkg-config and friends, so that the SDL2.pc, sdl2-config, + # etc. are created correctly. +-set(SDL_LIBS "-lSDL2") ++set(SDL_LIBS "-lSDL2-2.0") + set(SDL_CFLAGS "") + + # When building shared lib for Windows with MinGW, -- cgit v1.2.3-70-g09d2