Update package to use SDL2, improve package(), and make the sdl2 audio have a higher sample rate

3 files changed, 31 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8dc926dc3d45..8d04e2b04c05 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,24 @@
 pkgbase = terri-fried-git
 	pkgdesc = A multi-platform C++ game made for Ludum Dare 46
 	pkgver = r34.463aa1e
-	pkgrel = 11
+	pkgrel = 12
 	url = https://github.com/polymarsdev/terri-fried
 	arch = x86_64
 	license = custom
 	makedepends = git
-	makedepends = raylib
 	makedepends = gcc
-	depends = raylib
-	depends = pulseaudio
+	depends = sdl2
+	depends = sdl2_image
+	depends = sdl2_ttf
+	depends = sdl2_mixer
+	depends = hicolor-icon-theme
+	depends = bash
+	depends = glibc
 	source = terri-fried-git::git+https://github.com/polymarsdev/terri-fried
 	source = terri-fried
 	source = terri-fried.desktop
 	sha512sums = SKIP
-	sha512sums = 8d900d1de8c1ea4a4d337dc19664808540e14380cc99a147e4f3cbff3946f20f7db8fb4f3723e84f30703a23ddd704faa6d2c9e83f87ff85e3f6310929ccd9a4
+	sha512sums = 2f95712b853703111aba74ee9f2411c750bdbca973216eb7f2c06302ed9dbcbbd31b2139ff310ac0d140660092b60456b3b275fe1e92db58705063edf6a11d6c
 	sha512sums = cb435d7f26523d1af1182cd5f4af010c45cb4630133e04155ff806ca500c9e6882ae14ab0319b062aa3686bf72fd9e8569f449eef62571c8e080d7998b9100be
 
 pkgname = terri-fried-git
diff --git a/PKGBUILD b/PKGBUILD
index 2dc7708ebbdc..1d205c7b8d1d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,16 +1,18 @@
 # Maintainer: HurricanePootis <hurricanepootis@protonmail.com>
 pkgname=terri-fried-git
 pkgver=r34.463aa1e
-pkgrel=11
+pkgrel=12
 pkgdesc="A multi-platform C++ game made for Ludum Dare 46"
 arch=('x86_64')
 url="https://github.com/polymarsdev/terri-fried"
 license=('custom')
-depends=('raylib' 'pulseaudio')
-makedepends=('git' 'raylib' 'gcc')
-source=("$pkgname::git+https://github.com/polymarsdev/terri-fried" 'terri-fried' 'terri-fried.desktop')
+depends=('sdl2' 'sdl2_image' 'sdl2_ttf' 'sdl2_mixer' 'hicolor-icon-theme' 'bash' 'glibc')
+makedepends=('git' 'gcc')
+source=("$pkgname::git+https://github.com/polymarsdev/terri-fried" 
+	'terri-fried'
+	'terri-fried.desktop')
 sha512sums=('SKIP'
-            '8d900d1de8c1ea4a4d337dc19664808540e14380cc99a147e4f3cbff3946f20f7db8fb4f3723e84f30703a23ddd704faa6d2c9e83f87ff85e3f6310929ccd9a4'
+            '2f95712b853703111aba74ee9f2411c750bdbca973216eb7f2c06302ed9dbcbbd31b2139ff310ac0d140660092b60456b3b275fe1e92db58705063edf6a11d6c'
             'cb435d7f26523d1af1182cd5f4af010c45cb4630133e04155ff806ca500c9e6882ae14ab0319b062aa3686bf72fd9e8569f449eef62571c8e080d7998b9100be')
 
 pkgver() {
@@ -18,25 +20,26 @@ pkgver() {
 	printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
+prepare() {
+	cd "$srcdir/$pkgname/linux"
+	sed -i 's/22050/44100/g' main.cpp
+}
+
 build() {
-	cd "$srcdir/$pkgname/windows/raylib"
+	cd "$srcdir/$pkgname/linux/"
 	CXX=g++
 	$CXX -c -o player.o $CXXFLAGS player.cpp
 	$CXX -c -o platform.o $CXXFLAGS platform.cpp
 	$CXX -c -o main.o $CXXFLAGS main.cpp
-	$CXX -o terri-fried player.o platform.o main.o -lraylib
+	$CXX -o terri-fried player.o platform.o main.o $CXXFLAGS $LDFLAGS $(pkg-config --cflags --libs sdl2 SDL2_image SDL2_ttf SDL2_mixer) -lm
 }
 
 package() {
 	cd "$pkgdir"
-	mkdir -p "usr/share/terri-fried/"
-	mkdir -p "usr/bin/"
-	mkdir -p "usr/share/icons/hicolor/32x32/apps"
-	mkdir -p "usr/share/applications"
-	cp "$srcdir/$pkgname/windows/raylib/terri-fried" "$pkgdir/usr/share/terri-fried/."
-	cp -r "$srcdir/$pkgname/windows/raylib/resources" "$pkgdir/usr/share/terri-fried/."
-	cp "$srcdir/terri-fried" "$pkgdir/usr/bin/."
-	cp "$srcdir/$pkgname/windows/raylib/resources/egg.png" "$pkgdir/usr/share/icons/hicolor/32x32/apps/terri-fried.png"
-	cp "$srcdir/terri-fried.desktop"  "$pkgdir/usr/share/applications/."
-
+	cd "$srcdir/$pkgname/linux"
+	install -Dm755 terri-fried "$pkgdir/opt/terri-fried/terri-fried"
+	cp -r resources "$pkgdir/opt/terri-fried/resources"
+	install -Dm755 "$srcdir/terri-fried" "$pkgdir/usr/bin/terri-fried"
+	install -Dm644 "$srcdir/$pkgname/linux/resources/egg.png" "$pkgdir/usr/share/icons/hicolor/32x32/apps/terri-fried.png"
+	install -Dm644 "$srcdir/terri-fried.desktop" "$pkgdir/usr/share/applications/terri-fried.desktop"
 }
diff --git a/terri-fried b/terri-fried
index 9f6bcaeb1f40..54ddcac26609 100755
--- a/terri-fried
+++ b/terri-fried
@@ -12,8 +12,8 @@ fi
 
 
 cd "$HOME/.config/terri-fried" || exit
-ln -s "/usr/share/terri-fried/resources" "$HOME/.config/terri-fried/."
-ln -s "/usr/share/terri-fried/terri-fried" "$HOME/.config/terri-fried/."
+ln -s "/opt/terri-fried/resources" "$HOME/.config/terri-fried/."
+ln -s "/opt/terri-fried/terri-fried" "$HOME/.config/terri-fried/."
 
 "./terri-fried"