aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDugan Chen <thedoogster [t] gmail [dot] com>2013-02-12 23:12:26 -0600
committerErik Hanson <erik@slackbuilds.org>2013-02-14 00:26:58 -0600
commitd2f4275f17b612ac446ec3243c840ba1af595e96 (patch)
treec3400e2bdb18fcc989774f41542761fe9147b022
parent499811eb0ef7ce5d2b5a8e67a4c1ceaae28c64fb (diff)
games/nestopia: Updated for version 1.44.
Signed-off-by: Erik Hanson <erik@slackbuilds.org>
-rw-r--r--games/nestopia/Makefile.patch67
-rw-r--r--games/nestopia/doinst.sh3
-rw-r--r--games/nestopia/nestopia.SlackBuild9
-rw-r--r--games/nestopia/nestopia.info6
4 files changed, 46 insertions, 39 deletions
diff --git a/games/nestopia/Makefile.patch b/games/nestopia/Makefile.patch
index 95626c3772b5b..6f4920699b52e 100644
--- a/games/nestopia/Makefile.patch
+++ b/games/nestopia/Makefile.patch
@@ -1,53 +1,56 @@
---- Makefile.old 2013-01-02 12:58:22.586959169 -0800
-+++ Makefile 2013-01-02 14:56:29.603157717 -0800
-@@ -26,7 +26,7 @@
- LDFLAGS += -Wl,--as-needed
-
- EXE = nestopia
--LIBS = -lstdc++ -lm -lz -lasound $(shell sdl-config --libs) $(shell pkg-config --libs gtk+-3.0)
-+LIBS = -lX11 -lstdc++ -lm -lz -lasound $(shell sdl-config --libs) $(shell pkg-config --libs gtk+-3.0)
-
- PREFIX = /usr/local
- BINDIR = $(PREFIX)/bin
-@@ -41,12 +41,12 @@
- CXXFLAGS += -DDATADIR=\"$(DATADIR)\"
+--- Makefile.old 2013-02-12 20:16:28.270982024 -0800
++++ Makefile 2013-02-12 20:30:14.685976331 -0800
+@@ -6,8 +6,8 @@
+
+ CC = @gcc
+ CXX = @g++
+-CFLAGS ?= -O3 -g3
+-CXXFLAGS ?= -O3 -g3
++CFLAGS ?= -g3 -O3 -fPIC
++CXXFLAGS ?= -g3 -O3 -fPIC
+ CPPFLAGS += -DNST_PRAGMA_ONCE_SUPPORT -D_SZ_ONE_DIRECTORY
+ CPPFLAGS += -Isource -Isource/core -Isource/zlib -Isource/core/api -Isource/core/board -Isource/core/input -Isource/unix/unzip
+ CPPFLAGS += -Isource/core/vssystem -Isource/unix -Isource/nes_ntsc -I.. -I../nes_ntsc -Isource/unix/7zip
+@@ -48,12 +48,12 @@
+ CPPFLAGS += -DDATADIR=\"$(DATADIR)\"
# Linux objs
--OBJS = objs/linux/main.o objs/linux/oss.o objs/linux/interface.o objs/linux/settings.o
-+OBJS = objs/linux/main.o objs/linux/oss.o objs/linux/interface.o objs/linux/settings.o
- OBJS += objs/linux/auxio.o objs/linux/input.o objs/linux/kentry.o objs/linux/controlconfig.o objs/linux/cheats.o
- OBJS += objs/linux/seffect.o objs/linux/uihelp.o
+-OBJS = objs/unix/main.o objs/unix/oss.o objs/unix/interface.o objs/unix/settings.o
++OBJS = objs/unix/main.o objs/unix/oss.o objs/unix/interface.o objs/unix/settings.o
+ OBJS += objs/unix/auxio.o objs/unix/input.o objs/unix/kentry.o objs/unix/controlconfig.o objs/unix/cheats.o
+ OBJS += objs/unix/seffect.o objs/unix/uihelp.o
# 7-zip decoder (from LZMA SDK 4.58 beta)
--OBJS += objs/linux/7zip/7zAlloc.o objs/linux/7zip/7zBuf.o objs/linux/7zip/7zCrc.o objs/linux/7zip/7zDecode.o objs/linux/7zip/7zExtract.o
-+OBJS += objs/linux/7zip/7zAlloc.o objs/linux/7zip/7zBuf.o objs/linux/7zip/7zCrc.o objs/linux/7zip/7zDecode.o objs/linux/7zip/7zExtract.o
- OBJS += objs/linux/7zip/7zHeader.o objs/linux/7zip/7zIn.o objs/linux/7zip/7zItem.o objs/linux/7zip/LzmaDec.o
- OBJS += objs/linux/7zip/Alloc.o objs/linux/7zip/Bcj2.o objs/linux/7zip/Bra.o objs/linux/7zip/Bra86.o objs/linux/7zip/BraIA64.o
+-OBJS += objs/unix/7zip/7zAlloc.o objs/unix/7zip/7zBuf.o objs/unix/7zip/7zCrc.o objs/unix/7zip/7zDecode.o objs/unix/7zip/7zExtract.o
++OBJS += objs/unix/7zip/7zAlloc.o objs/unix/7zip/7zBuf.o objs/unix/7zip/7zCrc.o objs/unix/7zip/7zDecode.o objs/unix/7zip/7zExtract.o
+ OBJS += objs/unix/7zip/7zHeader.o objs/unix/7zip/7zIn.o objs/unix/7zip/7zItem.o objs/unix/7zip/LzmaDec.o
+ OBJS += objs/unix/7zip/Alloc.o objs/unix/7zip/Bcj2.o objs/unix/7zip/Bra.o objs/unix/7zip/Bra86.o objs/unix/7zip/BraIA64.o
-@@ -157,7 +157,7 @@
+@@ -164,7 +164,7 @@
OBJS += objs/core/vssystem/NstVsRbiBaseball.o objs/core/vssystem/NstVsSuperXevious.o objs/core/vssystem/NstVsSystem.o objs/core/vssystem/NstVsTkoBoxing.o
# object dirs
-OBJDIRS = objs objs/core objs/core/api objs/core/board objs/core/input objs/core/vssystem objs/nes_ntsc
+OBJDIRS = objs objs/core objs/core/api objs/core/board objs/core/input objs/core/vssystem objs/nes_ntsc
- OBJDIRS += objs/linux objs/linux/7zip objs/linux/unzip
+ OBJDIRS += objs/unix objs/unix/7zip objs/unix/unzip
# build rules
-@@ -184,13 +184,13 @@
+@@ -191,14 +191,13 @@
install:
mkdir -p $(DATADIR)/icons
-- install -m 0755 $(EXE) $(BINDIR)
-- install -m 0644 source/linux/icons/nestopia.desktop $(DATADIR)
+- mkdir -p $(PREFIX)/share/pixmaps
+- install -m 0755 $(BIN) $(BINDIR)
+- install -m 0644 source/unix/icons/nestopia.desktop $(DATADIR)
- install -m 0644 NstDatabase.xml $(DATADIR)
-+ install -Dm 0755 $(EXE) $(BINDIR)/$(EXE)
-+ install -Dm 0644 source/linux/icons/nestopia.desktop $(DATADIR)/nestopia.desktop
++ install -Dm 0755 $(BIN) $(BINDIR)/$(BIN)
++ install -Dm 0644 source/unix/icons/nestopia.desktop $(DATADIR)/nestopia.desktop
+ install -Dm 0644 NstDatabase.xml $(DATADIR)/NstDatabase.xml
- install -m 0644 source/linux/icons/*.png $(DATADIR)/icons
- install -m 0644 source/linux/icons/*.svg $(DATADIR)/icons
-- install -m 0644 source/linux/icons/nestopia.svg /usr/share/pixmaps
+ install -m 0644 source/unix/icons/*.png $(DATADIR)/icons
+ install -m 0644 source/unix/icons/*.svg $(DATADIR)/icons
+- install -m 0644 source/unix/icons/nestopia.svg $(PREFIX)/share/pixmaps
- xdg-desktop-menu install --novendor $(DATADIR)/nestopia.desktop
-+ install -Dm 0644 source/linux/icons/nestopia.svg $(PREFIX)/share/pixmaps/nestopia.svg
++ install -Dm 0644 source/unix/icons/nestopia.svg $(PREFIX)/share/pixmaps/nestopia.svg
+ install -Dm 0644 $(DATADIR)/nestopia.desktop $(PREFIX)/share/applications/nestopia.desktop
uninstall:
diff --git a/games/nestopia/doinst.sh b/games/nestopia/doinst.sh
new file mode 100644
index 0000000000000..5fb28930db0b9
--- /dev/null
+++ b/games/nestopia/doinst.sh
@@ -0,0 +1,3 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+ /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
diff --git a/games/nestopia/nestopia.SlackBuild b/games/nestopia/nestopia.SlackBuild
index d10c25ab4543d..f292b9c5a69f6 100644
--- a/games/nestopia/nestopia.SlackBuild
+++ b/games/nestopia/nestopia.SlackBuild
@@ -5,7 +5,7 @@
# Written by Dugan Chen (thedoogster@gmail.com)
PRGNAM=nestopia
-VERSION=${VERSION:-1.43}
+VERSION=${VERSION:-1.44}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -46,7 +46,7 @@ rm -rf $PRGNAM-$VERSION
tar xvf $CWD/$PRGNAM-$VERSION.t?z*
cd $PRGNAM-$VERSION
-chown -R root:root .
+#chown -R root:root .
find . \
\( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
-exec chmod 755 {} \; -o \
@@ -55,7 +55,7 @@ find . \
patch < $CWD/Makefile.patch
sed -i "s/-O3 -g3/-g3 ${SLKCFLAGS}/g" Makefile
-make PREFIX=/usr
+make -j1 PREFIX=/usr
make install PREFIX=$PKG/usr
find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
@@ -63,13 +63,14 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a \
- COPYING README README.linux readme.html \
+ COPYING README.md README.unix changelog.txt readme.html \
$PKG/usr/doc/$PRGNAM-$VERSION
cp -ar doc/ $PKG/usr/doc/$PRGNAM-$VERSION/api/
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
cd $PKG
/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/games/nestopia/nestopia.info b/games/nestopia/nestopia.info
index 9d135232838be..573705ed01edf 100644
--- a/games/nestopia/nestopia.info
+++ b/games/nestopia/nestopia.info
@@ -1,8 +1,8 @@
PRGNAM="nestopia"
-VERSION="1.4.3"
+VERSION="1.44"
HOMEPAGE="http://0ldsk00l.ca/nestopia.html"
-DOWNLOAD="https://github.com/downloads/rdanbrook/nestopia/nestopia-1.43.tgz"
-MD5SUM="959ca606bc2f43b3a56eadce5492902f"
+DOWNLOAD="http://downloads.sourceforge.net/project/nestopiaue/1.44/nestopia-1.44.tgz"
+MD5SUM="5ab9dcca6c1a667bbef7edd626bd08c9"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""