v0.2.2-1

3 files changed, 139 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f8399589535e..214613735989 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,25 +1,34 @@
 pkgbase = ocp
 	pkgdesc = Open Cubic Player
-	pkgver = 0.2.1
+	pkgver = 0.2.2
 	pkgrel = 1
 	url = https://github.com/mywave82/opencubicplayer
 	arch = i686
 	arch = x86_64
 	license = GPL
 	makedepends = desktop-file-utils
-	depends = libsidplay
 	depends = libxxf86vm
 	depends = libvorbis
 	depends = libxpm
 	depends = alsa-lib
 	depends = libmad
 	depends = flac
-	depends = sdl
+	depends = sdl2
 	depends = adplug
-	source = git+https://github.com/mywave82/opencubicplayer.git#tag=v0.2.1
+	depends = libjpeg-turbo
+	depends = libpng
+	depends = freetype2
+	depends = ttf-unifont
+	depends = patch
+	depends = xa
+	source = git+https://github.com/mywave82/opencubicplayer.git#tag=v0.2.2
 	source = git+https://github.com/mywave82/timidity.git
+	source = git+https://github.com/mywave82/sidplay-residfp-ocp
+	source = fix-unifont.diff
 	md5sums = SKIP
 	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = 98a6ab1b11da171b118e0cf7b0485e7c
 
 pkgname = ocp
 
diff --git a/PKGBUILD b/PKGBUILD
index 2b2bfdd0448b..b037b9e18e32 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,29 +2,36 @@
 # Original PKGBUILD by: berkus [berkus_at_madfire_dot_net]
 
 pkgname=ocp
-pkgver=0.2.1
+pkgver=0.2.2
 pkgrel=1
 pkgdesc="Open Cubic Player"
 arch=('i686' 'x86_64')
 url="https://github.com/mywave82/opencubicplayer"
-depends=('libsidplay' 'libxxf86vm' 'libvorbis' 'libxpm' 'alsa-lib' 'libmad' 'flac' 'sdl' 'adplug')
+depends=('libxxf86vm' 'libvorbis' 'libxpm' 'alsa-lib' 'libmad' 'flac' 'sdl2' 'adplug' 'libjpeg-turbo' 'libpng' 'freetype2' 'ttf-unifont' 'patch' 'xa')
 makedepends=('desktop-file-utils')
 license=('GPL')
 source=(git+https://github.com/mywave82/opencubicplayer.git#tag=v${pkgver}
-        git+https://github.com/mywave82/timidity.git)
+        git+https://github.com/mywave82/timidity.git
+		git+https://github.com/mywave82/sidplay-residfp-ocp
+		fix-unifont.diff)
 md5sums=('SKIP'
-         'SKIP')
+         'SKIP'
+         'SKIP'
+         '98a6ab1b11da171b118e0cf7b0485e7c')
 
 prepare() {
 	cd opencubicplayer
 	git submodule init
 	git config submodule.playgmi/timidity-git.url $srcdir/timidity
+	git config submodule.playsid/sidplayfp-git.url $srcdir/sidplay-residfp-ocp
 	git submodule update
 }
 
 build() {
 	cd opencubicplayer
-	./configure --prefix=/usr --sysconfdir=/etc
+
+	patch -p1 -i $srcdir/fix-unifont.diff
+	./configure --prefix=/usr --sysconfdir=/etc --with-unifontdir=/usr/share/fonts/Unifont
 	make DESTDIR=$pkgdir
 }
 
diff --git a/fix-unifont.diff b/fix-unifont.diff
new file mode 100644
index 000000000000..676bb73b5c2c
--- /dev/null
+++ b/fix-unifont.diff
@@ -0,0 +1,114 @@
+Index: asdf/configure
+===================================================================
+--- asdf.orig/configure
++++ asdf/configure
+@@ -9849,15 +9849,15 @@ fi
+   prefix=$prefix_save
+   exec_prefix=$exec_prefix_save
+ 
+-	as_ac_File=`$as_echo "ac_cv_file_$UNIFONTDIR/unifont.ttf" | $as_tr_sh`
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $UNIFONTDIR/unifont.ttf" >&5
+-$as_echo_n "checking for $UNIFONTDIR/unifont.ttf... " >&6; }
++	as_ac_File=`$as_echo "ac_cv_file_$UNIFONTDIR/Unifont.ttf" | $as_tr_sh`
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $UNIFONTDIR/Unifont.ttf" >&5
++$as_echo_n "checking for $UNIFONTDIR/Unifont.ttf... " >&6; }
+ if eval \${$as_ac_File+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   test "$cross_compiling" = yes &&
+   as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
+-if test -r "$UNIFONTDIR/unifont.ttf"; then
++if test -r "$UNIFONTDIR/Unifont.ttf"; then
+   eval "$as_ac_File=yes"
+ else
+   eval "$as_ac_File=no"
+@@ -9869,18 +9869,18 @@ $as_echo "$ac_res" >&6; }
+ if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
+ 
+ else
+-  as_fn_error $? "$UNIFONTDIR/unifont.ttf not found - please use --with-unifontdir=/path/ (needed by SDL2)" "$LINENO" 5
++  as_fn_error $? "$UNIFONTDIR/Unifont.ttf not found - please use --with-unifontdir=/path/ (needed by SDL2)" "$LINENO" 5
+ fi
+ 
+-	as_ac_File=`$as_echo "ac_cv_file_$UNIFONTDIR/unifont_csur.ttf" | $as_tr_sh`
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $UNIFONTDIR/unifont_csur.ttf" >&5
+-$as_echo_n "checking for $UNIFONTDIR/unifont_csur.ttf... " >&6; }
++	as_ac_File=`$as_echo "ac_cv_file_$UNIFONTDIR/Unifont_CSUR.ttf" | $as_tr_sh`
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $UNIFONTDIR/Unifont_CSUR.ttf" >&5
++$as_echo_n "checking for $UNIFONTDIR/Unifont_CSUR.ttf... " >&6; }
+ if eval \${$as_ac_File+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   test "$cross_compiling" = yes &&
+   as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
+-if test -r "$UNIFONTDIR/unifont_csur.ttf"; then
++if test -r "$UNIFONTDIR/Unifont_CSUR.ttf"; then
+   eval "$as_ac_File=yes"
+ else
+   eval "$as_ac_File=no"
+@@ -9892,18 +9892,18 @@ $as_echo "$ac_res" >&6; }
+ if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
+ 
+ else
+-  as_fn_error $? "$UNIFONTDIR/unifont_csur.ttf not found - please use --with-unifontdir=/path/ (needed by SDL2)" "$LINENO" 5
++  as_fn_error $? "$UNIFONTDIR/Unifont_CSUR.ttf not found - please use --with-unifontdir=/path/ (needed by SDL2)" "$LINENO" 5
+ fi
+ 
+-	as_ac_File=`$as_echo "ac_cv_file_$UNIFONTDIR/unifont_upper.ttf" | $as_tr_sh`
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $UNIFONTDIR/unifont_upper.ttf" >&5
+-$as_echo_n "checking for $UNIFONTDIR/unifont_upper.ttf... " >&6; }
++	as_ac_File=`$as_echo "ac_cv_file_$UNIFONTDIR/Unifont_Upper.ttf" | $as_tr_sh`
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $UNIFONTDIR/Unifont_Upper.ttf" >&5
++$as_echo_n "checking for $UNIFONTDIR/Unifont_Upper.ttf... " >&6; }
+ if eval \${$as_ac_File+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   test "$cross_compiling" = yes &&
+   as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
+-if test -r "$UNIFONTDIR/unifont_upper.ttf"; then
++if test -r "$UNIFONTDIR/Unifont_Upper.ttf"; then
+   eval "$as_ac_File=yes"
+ else
+   eval "$as_ac_File=no"
+@@ -9915,7 +9915,7 @@ $as_echo "$ac_res" >&6; }
+ if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
+ 
+ else
+-  as_fn_error $? "$UNIFONTDIR/unifont_upper.ttf not found - please use --with-unifontdir=/path/ (needed by SDL2)" "$LINENO" 5
++  as_fn_error $? "$UNIFONTDIR/Unifont_Upper.ttf not found - please use --with-unifontdir=/path/ (needed by SDL2)" "$LINENO" 5
+ fi
+ 
+ 	cat >>confdefs.h <<_ACEOF
+Index: asdf/stuff/poutput-fontengine.c
+===================================================================
+--- asdf.orig/stuff/poutput-fontengine.c
++++ asdf/stuff/poutput-fontengine.c
+@@ -393,22 +393,22 @@ int fontengine_init (void)
+ 		return 1;
+ 	}
+ 
+-	unifont_bmp = TTF_OpenFontFilename(UNIFONTDIR "/unifont.ttf", 16, 0, 0, 0);
++	unifont_bmp = TTF_OpenFontFilename(UNIFONTDIR "/Unifont.ttf", 16, 0, 0, 0);
+ 	if (!unifont_bmp)
+ 	{
+-		fprintf (stderr, "TTF_OpenFont(\"" UNIFONTDIR "/unifont.ttf\") failed: %s\n", TTF_GetError());
++		fprintf (stderr, "TTF_OpenFont(\"" UNIFONTDIR "/Unifont.ttf\") failed: %s\n", TTF_GetError());
+ 		TTF_ClearError();
+ 	}
+-	unifont_csur = TTF_OpenFontFilename(UNIFONTDIR "/unifont_csur.ttf", 16, 0, 0, 0);
++	unifont_csur = TTF_OpenFontFilename(UNIFONTDIR "/Unifont_CSUR.ttf", 16, 0, 0, 0);
+ 	if (!unifont_csur)
+ 	{
+-		fprintf (stderr, "TTF_OpenFont(\"" UNIFONTDIR "/unifont_csur.ttf\") failed: %s\n", TTF_GetError());
++		fprintf (stderr, "TTF_OpenFont(\"" UNIFONTDIR "/Unifont_CSUR.ttf\") failed: %s\n", TTF_GetError());
+ 		TTF_ClearError();
+ 	}
+-	unifont_upper = TTF_OpenFontFilename(UNIFONTDIR "/unifont_upper.ttf", 16, 0, 0, 0);
++	unifont_upper = TTF_OpenFontFilename(UNIFONTDIR "/Unifont_Upper.ttf", 16, 0, 0, 0);
+ 	if (!unifont_upper)
+ 	{
+-		fprintf (stderr, "TTF_OpenFont(\"" UNIFONTDIR "/unifont_upper.ttf\") failed: %s\n", TTF_GetError());
++		fprintf (stderr, "TTF_OpenFont(\"" UNIFONTDIR "/Unifont_Upper.ttf\") failed: %s\n", TTF_GetError());
+ 		TTF_ClearError();
+ 	}
+