diff options
author | Matteo Bernardini | 2019-10-19 22:49:29 +0200 |
---|---|---|
committer | Matteo Bernardini | 2019-10-19 22:49:29 +0200 |
commit | fc67f7a82f63f00609a7c84207827e0f219402f2 (patch) | |
tree | 136fc97f4ccd0601cd6fcae641fa9052e2900785 /games/desmume | |
parent | 2bf20a8424335e7f9149c2f6deeb0f2d02c93e3c (diff) | |
download | slackbuilds-fc67f7a82f63f00609a7c84207827e0f219402f2.tar.gz |
20191019.1 global branch merge.current-20191019.1
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
Diffstat (limited to 'games/desmume')
-rw-r--r-- | games/desmume/desmume.SlackBuild | 27 | ||||
-rw-r--r-- | games/desmume/desmume.info | 6 | ||||
-rw-r--r-- | games/desmume/osmesa-header-fix.patch | 11 |
3 files changed, 14 insertions, 30 deletions
diff --git a/games/desmume/desmume.SlackBuild b/games/desmume/desmume.SlackBuild index 4e5fec368b..c410fec43c 100644 --- a/games/desmume/desmume.SlackBuild +++ b/games/desmume/desmume.SlackBuild @@ -23,13 +23,13 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=desmume -VERSION=${VERSION:-0.9.11} +VERSION=${VERSION:-20190129_3e73a55} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -40,8 +40,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -60,7 +60,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +tar xvf $CWD/$PRGNAM-$VERSION.tar.?z cd $PRGNAM-$VERSION chown -R root:root . find -L . \ @@ -69,16 +69,10 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -# Fix end-of-line encoding. -for i in AUTHORS; do - cp -a $i ${i}.new - sed -i 's/\r//' ${i}.new - touch -r $i ${i}.new - mv ${i}.new $i -done +# https://github.com/TASVideos/desmume -# Fix missing header. -patch -p1 < $CWD/osmesa-header-fix.patch +cd $PRGNAM/src/frontend/posix +./autogen.sh CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ @@ -88,7 +82,6 @@ CXXFLAGS="$SLKCFLAGS" \ --mandir=/usr/man \ --enable-osmesa \ --enable-hud \ - --enable-gdb-stub \ --enable-wifi \ --enable-openal \ --enable-glade \ @@ -99,6 +92,8 @@ CXXFLAGS="$SLKCFLAGS" \ make make install DESTDIR=$PKG +cd ../../.. + find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true @@ -106,7 +101,7 @@ find $PKG/usr/man -type f -exec gzip -9 {} \; mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ - AUTHORS ChangeLog COPYING INSTALL README README.LIN ds*.txt \ + AUTHORS ChangeLog COPYING README README.LIN doc/ds*.txt \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/games/desmume/desmume.info b/games/desmume/desmume.info index b06dd8381e..3cbebdfbd0 100644 --- a/games/desmume/desmume.info +++ b/games/desmume/desmume.info @@ -1,8 +1,8 @@ PRGNAM="desmume" -VERSION="0.9.11" +VERSION="20190129_3e73a55" HOMEPAGE="http://desmume.org/" -DOWNLOAD="http://downloads.sourceforge.net/desmume/desmume-0.9.11.tar.gz" -MD5SUM="269b5d4ddc5715720469a9d0efc53044" +DOWNLOAD="http://ponce.cc/slackware/sources/repo/desmume-20190129_3e73a55.tar.xz" +MD5SUM="d198b000834ed0e13a73051caa91ec7c" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="OpenAL agg gtkglext soundtouch zziplib" diff --git a/games/desmume/osmesa-header-fix.patch b/games/desmume/osmesa-header-fix.patch deleted file mode 100644 index 7ba5bd070f..0000000000 --- a/games/desmume/osmesa-header-fix.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur desmume-0.9.11.orig/src/gtk/osmesa_3Demu.cpp desmume-0.9.11/src/gtk/osmesa_3Demu.cpp ---- desmume-0.9.11.orig/src/gtk/osmesa_3Demu.cpp 2015-02-14 15:05:26.000000000 +0000 -+++ desmume-0.9.11/src/gtk/osmesa_3Demu.cpp 2015-05-09 02:00:11.279367208 +0000 -@@ -20,6 +20,7 @@ - - #ifdef HAVE_LIBOSMESA - #include <stdlib.h> -+#include <stdio.h> - #include <GL/osmesa.h> - #include "../OGLRender.h" - #include "osmesa_3Demu.h" |