From f4a82177f3bea3e744cbc4acbd052fc7be31cab1 Mon Sep 17 00:00:00 2001
From: Aki <please@ignore.pl>
Date: Mon, 13 Mar 2023 01:16:11 +0100
Subject: Replaced raylib-both with just -static version

Current CMake+pkg-config configuration provided with raylib does not
properly handle case in which both library version are available.
---
 raylib-both/.SRCINFO     | 24 ----------------------
 raylib-both/.gitignore   |  1 -
 raylib-both/PKGBUILD     | 53 ------------------------------------------------
 raylib-static/.SRCINFO   | 24 ++++++++++++++++++++++
 raylib-static/.gitignore |  1 +
 raylib-static/PKGBUILD   | 37 +++++++++++++++++++++++++++++++++
 6 files changed, 62 insertions(+), 78 deletions(-)
 delete mode 100644 raylib-both/.SRCINFO
 delete mode 100644 raylib-both/.gitignore
 delete mode 100644 raylib-both/PKGBUILD
 create mode 100644 raylib-static/.SRCINFO
 create mode 100644 raylib-static/.gitignore
 create mode 100644 raylib-static/PKGBUILD

diff --git a/raylib-both/.SRCINFO b/raylib-both/.SRCINFO
deleted file mode 100644
index e68b15f..0000000
--- a/raylib-both/.SRCINFO
+++ /dev/null
@@ -1,24 +0,0 @@
-pkgbase = raylib-both
-	pkgdesc = Simple and easy-to-use game programming library
-	pkgver = 4.2.0
-	pkgrel = 1
-	url = https://www.raylib.com
-	arch = x86_64
-	license = ZLIB
-	makedepends = cmake
-	makedepends = git
-	makedepends = libx11
-	makedepends = libxcursor
-	makedepends = libxinerama
-	makedepends = libxrandr
-	makedepends = ninja
-	makedepends = vulkan-headers
-	makedepends = xorg-server-devel
-	makedepends = xorg-xinput
-	provides = raylib
-	conflicts = raylib
-	options = staticlibs
-	source = git+https://github.com/raysan5/raylib#commit=bf2ad9df5fdcaa385b2a7f66fd85632eeebbadaa
-	b2sums = SKIP
-
-pkgname = raylib-both
diff --git a/raylib-both/.gitignore b/raylib-both/.gitignore
deleted file mode 100644
index c7c61eb..0000000
--- a/raylib-both/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-raylib/
diff --git a/raylib-both/PKGBUILD b/raylib-both/PKGBUILD
deleted file mode 100644
index 214995c..0000000
--- a/raylib-both/PKGBUILD
+++ /dev/null
@@ -1,53 +0,0 @@
-_pkgname=raylib
-pkgname=raylib-both
-pkgver=4.2.0
-pkgrel=1
-pkgdesc='Simple and easy-to-use game programming library'
-provides=($_pkgname)
-conflicts=($_pkgname)
-options=(staticlibs)
-arch=(x86_64)
-url='https://www.raylib.com'
-license=(ZLIB)
-makedepends=(cmake git libx11 libxcursor libxinerama libxrandr ninja vulkan-headers xorg-server-devel xorg-xinput)
-source=("git+https://github.com/raysan5/raylib#commit=bf2ad9df5fdcaa385b2a7f66fd85632eeebbadaa")
-b2sums=('SKIP')
-
-build() {
-  cmake \
-    -B shared \
-    -D BUILD_EXAMPLES=OFF \
-    -D BUILD_SHARED_LIBS=ON \
-    -D CMAKE_BUILD_TYPE=Release \
-    -D CMAKE_C_FLAGS="$CFLAGS -fPIC -w" \
-    -D CMAKE_INSTALL_LIBDIR=lib \
-    -D CMAKE_INSTALL_PREFIX=/usr \
-    -D OpenGL_GL_PREFERENCE=GLVND \
-    -D USE_EXTERNAL_GLFW=OFF \
-    -D WITH_PIC=ON \
-    -G Ninja \
-    -S $_pkgname \
-    -W no-dev
-  cmake \
-    -B static \
-    -D BUILD_EXAMPLES=OFF \
-    -D BUILD_SHARED_LIBS=OFF \
-    -D CMAKE_BUILD_TYPE=Release \
-    -D CMAKE_C_FLAGS="$CFLAGS -w" \
-    -D CMAKE_INSTALL_LIBDIR=lib \
-    -D CMAKE_INSTALL_PREFIX=/usr \
-    -D OpenGL_GL_PREFERENCE=GLVND \
-    -D USE_EXTERNAL_GLFW=OFF \
-    -G Ninja \
-    -S $_pkgname \
-    -W no-dev
-  ninja -C shared
-  ninja -C static
-}
-
-package() {
-  DESTDIR="$pkgdir" ninja -C shared install
-  DESTDIR="$pkgdir" ninja -C static install
-  install -Dm 644 "$_pkgname/LICENSE" \
-    "$pkgdir/usr/share/licenses/$_pkgname/LICENSE"
-}
diff --git a/raylib-static/.SRCINFO b/raylib-static/.SRCINFO
new file mode 100644
index 0000000..d4645cd
--- /dev/null
+++ b/raylib-static/.SRCINFO
@@ -0,0 +1,24 @@
+pkgbase = raylib-static
+	pkgdesc = Simple and easy-to-use game programming library
+	pkgver = 4.2.0
+	pkgrel = 1
+	url = https://www.raylib.com
+	arch = x86_64
+	license = ZLIB
+	makedepends = cmake
+	makedepends = git
+	makedepends = libx11
+	makedepends = libxcursor
+	makedepends = libxinerama
+	makedepends = libxrandr
+	makedepends = ninja
+	makedepends = vulkan-headers
+	makedepends = xorg-server-devel
+	makedepends = xorg-xinput
+	provides = raylib
+	conflicts = raylib
+	options = staticlibs
+	source = git+https://github.com/raysan5/raylib#commit=bf2ad9df5fdcaa385b2a7f66fd85632eeebbadaa
+	b2sums = SKIP
+
+pkgname = raylib-static
diff --git a/raylib-static/.gitignore b/raylib-static/.gitignore
new file mode 100644
index 0000000..c7c61eb
--- /dev/null
+++ b/raylib-static/.gitignore
@@ -0,0 +1 @@
+raylib/
diff --git a/raylib-static/PKGBUILD b/raylib-static/PKGBUILD
new file mode 100644
index 0000000..f92cdaa
--- /dev/null
+++ b/raylib-static/PKGBUILD
@@ -0,0 +1,37 @@
+_pkgname=raylib
+pkgname=raylib-static
+pkgver=4.2.0
+pkgrel=1
+pkgdesc='Simple and easy-to-use game programming library'
+provides=($_pkgname)
+conflicts=($_pkgname)
+options=(staticlibs)
+arch=(x86_64)
+url='https://www.raylib.com'
+license=(ZLIB)
+makedepends=(cmake git libx11 libxcursor libxinerama libxrandr ninja vulkan-headers xorg-server-devel xorg-xinput)
+source=("git+https://github.com/raysan5/raylib#commit=bf2ad9df5fdcaa385b2a7f66fd85632eeebbadaa")
+b2sums=('SKIP')
+
+build() {
+  cmake \
+    -B static \
+    -D BUILD_EXAMPLES=OFF \
+    -D BUILD_SHARED_LIBS=OFF \
+    -D CMAKE_BUILD_TYPE=Release \
+    -D CMAKE_C_FLAGS="$CFLAGS -w" \
+    -D CMAKE_INSTALL_LIBDIR=lib \
+    -D CMAKE_INSTALL_PREFIX=/usr \
+    -D OpenGL_GL_PREFERENCE=GLVND \
+    -D USE_EXTERNAL_GLFW=OFF \
+    -G Ninja \
+    -S $_pkgname \
+    -W no-dev
+  ninja -C static
+}
+
+package() {
+  DESTDIR="$pkgdir" ninja -C static install
+  install -Dm 644 "$_pkgname/LICENSE" \
+    "$pkgdir/usr/share/licenses/$_pkgname/LICENSE"
+}
-- 
cgit v1.1