ports/148432: Update ports emulators/bsnes : update to 0.65
Emmanuel Vadot
elbarto at aracdebsd.org
Wed Jul 7 16:10:01 UTC 2010
>Number: 148432
>Category: ports
>Synopsis: Update ports emulators/bsnes : update to 0.65
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Wed Jul 07 16:10:01 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator: Emmanuel Vadot
>Release: 8.1-PRERELEASE i386
>Organization:
ArcadeBSD
>Environment:
FreeBSD emeraldas 8.1-PRERELEASE FreeBSD 8.1-PRERELEASE #2: Sun Jul 4 19:06:12 CEST 2010 root at emeraldas:/usr/obj/usr/src/sys/GENERIC i386
>Description:
Update ports to 0.65
Add Xv video drivers to default.
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff -uNr /usr/ports/emulators/bsnes/Makefile bsnes/Makefile
--- /usr/ports/emulators/bsnes/Makefile 2010-06-06 22:39:18.000000000 +0200
+++ bsnes/Makefile 2010-07-07 17:57:00.000000000 +0200
@@ -2,16 +2,14 @@
# Date created: 2009-06-13
# Whom: elbarto
#
-# $FreeBSD: ports/emulators/bsnes/Makefile,v 1.8 2010/06/06 20:39:18 naddy Exp $
+# $FreeBSD: ports/emulators/bsnes/Makefile,v 1.6 2010/01/25 19:15:08 pav Exp $
PORTNAME= bsnes
-PORTVERSION= 0.58
-PORTREVISION= 3
+PORTVERSION= 0.65
CATEGORIES= emulators
-MASTER_SITES= http://byuu.org/files/ \
+MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} \
ftp://ftp.arcadebsd.org/pub/ArcadeBSD/ports/distfiles/
-DISTNAME= ${PORTNAME}_v${PORTVERSION:S/.//}${EXTRACT_SUFX} snesreader_v010${EXTRACT_SUFX} \
- snesfilter_v007${EXTRACT_SUFX} supergameboy_v014
+DISTNAME= ${PORTNAME}_v${PORTVERSION:S/.//}
MAINTAINER= elbarto at ArcadeBSD.org
COMMENT= Super Nintendo/Super Famicom emulator
@@ -21,6 +19,7 @@
USE_XORG= videoproto xv x11
USE_QT_VER= 4
QT_COMPONENTS= qmake_build uic_build moc_build rcc_build gui
+USE_GCC?= 4.4+
ONLY_FOR_ARCHS= i386 amd64
WRKSRC= ${WRKDIR}/
@@ -28,7 +27,7 @@
USE_LDCONFIG= yes
OPTIONS= VIDEO_GLX "Build GLX Video Driver" on \
- VIDEO_XV "Build Xv Video Driver" off \
+ VIDEO_XV "Build Xv Video Driver" on \
VIDEO_SDL "Build SDL Video Driver" on \
VIDEO_QT "Build QtImage Video Driver" off \
SOUND_OPENAL "Build OpenAL Sound Driver" off \
@@ -40,6 +39,11 @@
.include <bsd.port.pre.mk>
+pre-everything::
+.if ${OSVERSION} < 700000
+IGNORE= Does not compile.
+.endif
+
.if defined(WITH_VIDEO_GLX)
USE_GL+= gl
VIDEO_DRIVER+= video.glx
@@ -73,7 +77,7 @@
.endif
.if defined(WITH_SOUND_AO)
-LIB_DEPENDS+= ao.4:${PORTSDIR}/audio/libao
+LIB_DEPENDS+= ao.3:${PORTSDIR}/audio/libao
AUDIO_DRIVER+= audio.ao
.endif
@@ -99,14 +103,15 @@
.endif
post-patch:
- ${REINPLACE_CMD} -e 's|VIDEO|${VIDEO_DRIVER}|' ${WRKSRC}/src/Makefile
- ${REINPLACE_CMD} -e 's|AUDIO|${AUDIO_DRIVER}|' ${WRKSRC}/src/Makefile
- ${REINPLACE_CMD} -e 's|INPUT|${INPUT_DRIVER}|' ${WRKSRC}/src/Makefile
+ ${REINPLACE_CMD} -e 's|VIDEO|${VIDEO_DRIVER}|' ${WRKSRC}/src/ui_qt/Makefile
+ ${REINPLACE_CMD} -e 's|AUDIO|${AUDIO_DRIVER}|' ${WRKSRC}/src/ui_qt/Makefile
+ ${REINPLACE_CMD} -e 's|INPUT|${INPUT_DRIVER}|' ${WRKSRC}/src/ui_qt/Makefile
do-build:
(cd ${WRKSRC}/src && ${GMAKE} ${MAKE_ENV})
(cd ${WRKSRC}/snesreader && ${GMAKE} ${MAKE_ENV})
(cd ${WRKSRC}/snesfilter && ${GMAKE} ${MAKE_ENV})
+ (cd ${WRKSRC}/supergameboy && ${GMAKE} ${MAKE_ENV})
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin/
@@ -116,5 +121,9 @@
${INSTALL_DATA} ${WRKSRC}/src/data/bsnes.desktop ${PREFIX}/share/applications/bsnes.desktop
${INSTALL_DATA} ${WRKSRC}/snesreader/libsnesreader.so ${PREFIX}/lib/
${INSTALL_DATA} ${WRKSRC}/snesfilter/libsnesfilter.so ${PREFIX}/lib/
+ ${INSTALL_DATA} ${WRKSRC}/supergameboy/libsupergameboy.so ${PREFIX}/lib/
+
+post-install:
+ @${CAT} ${PKGMESSAGE}
.include <bsd.port.post.mk>
diff -uNr /usr/ports/emulators/bsnes/distinfo bsnes/distinfo
--- /usr/ports/emulators/bsnes/distinfo 2009-12-23 00:37:30.000000000 +0100
+++ bsnes/distinfo 2010-07-07 17:57:24.000000000 +0200
@@ -1,12 +1,3 @@
-MD5 (bsnes_v058.tar.bz2) = 8235f42b79f8c6c3f85470b9c8904779
-SHA256 (bsnes_v058.tar.bz2) = 448ec9170628deca66bf3b9260441489418f695f13f2e78b184bed100c11c93e
-SIZE (bsnes_v058.tar.bz2) = 450201
-MD5 (snesreader_v010.tar.bz2) = 757e8c9cfc38290447e9b8ee74b31006
-SHA256 (snesreader_v010.tar.bz2) = 7aa31584487e00e376b49df069694f4f542260c94bf0f4179806c50ab1a8bb11
-SIZE (snesreader_v010.tar.bz2) = 208397
-MD5 (snesfilter_v007.tar.bz2) = 189e9799debebf4ad639878a270d2a39
-SHA256 (snesfilter_v007.tar.bz2) = a7f7896749bc8457d76da8560a8f3b4263d9b2a3bacf6f747df1840d46ebcd3c
-SIZE (snesfilter_v007.tar.bz2) = 49103
-MD5 (supergameboy_v014.tar.bz2) = 5773da8eb0b9e8f82a081fde3d941b36
-SHA256 (supergameboy_v014.tar.bz2) = b31d5d345ce86cfa5ef47df1e0886a0aa637565de1dc50293aa2fbecf162135a
-SIZE (supergameboy_v014.tar.bz2) = 122939
+MD5 (bsnes_v065.tar.bz2) = c59e1e76608f4328edefcaab724c0ee1
+SHA256 (bsnes_v065.tar.bz2) = d657323611fc2b8fca5bcd32b2617799052c08265159af6014ede0728c754d02
+SIZE (bsnes_v065.tar.bz2) = 927533
diff -uNr /usr/ports/emulators/bsnes/files/patch-Makefile bsnes/files/patch-Makefile
--- /usr/ports/emulators/bsnes/files/patch-Makefile 2009-11-26 15:32:14.000000000 +0100
+++ bsnes/files/patch-Makefile 1970-01-01 01:00:00.000000000 +0100
@@ -1,28 +0,0 @@
---- src/Makefile.orig 2009-11-01 00:45:19.000000000 +0100
-+++ src/Makefile 2009-11-01 00:45:50.000000000 +0100
-@@ -6,9 +6,9 @@
- ### compiler ###
- ################
-
--c := $(compiler)
--cpp := $(subst cc,++,$(compiler))
--flags := -O3 -fomit-frame-pointer -Ilib
-+c := ${CC}
-+cpp := ${CXX}
-+flags := -O3 -fomit-frame-pointer -Ilib -I${LOCALBASE}/include
- link :=
-
- # profile-guided instrumentation:
-@@ -25,9 +25,9 @@
- ifeq ($(platform),x)
- link += -s
-
-- ruby := video.glx video.xv video.qtraster video.sdl
-- ruby += audio.alsa audio.openal audio.oss audio.pulseaudio audio.ao
-- ruby += input.sdl input.x
-+ ruby := VIDEO
-+ ruby += AUDIO
-+ ruby += INPUT
-
- link += $(if $(findstring audio.openal,$(ruby)),-lopenal)
- else ifeq ($(platform),osx)
diff -uNr /usr/ports/emulators/bsnes/files/patch-Makefile-libnall bsnes/files/patch-Makefile-libnall
--- /usr/ports/emulators/bsnes/files/patch-Makefile-libnall 2009-11-26 15:32:14.000000000 +0100
+++ bsnes/files/patch-Makefile-libnall 1970-01-01 01:00:00.000000000 +0100
@@ -1,16 +0,0 @@
---- src/lib/nall/Makefile.orig 2009-11-01 00:30:05.000000000 +0100
-+++ src/lib/nall/Makefile 2009-11-01 00:30:26.000000000 +0100
-@@ -29,11 +29,11 @@
- endif
-
- ifeq ($(compiler),)
-- compiler := gcc
-+ compiler := ${CC}
- endif
-
- ifeq ($(prefix),)
-- prefix := /usr/local
-+ prefix := ${PREFIX}
- endif
-
- #####
diff -uNr /usr/ports/emulators/bsnes/files/patch-snesfilter-Makefile bsnes/files/patch-snesfilter-Makefile
--- /usr/ports/emulators/bsnes/files/patch-snesfilter-Makefile 1970-01-01 01:00:00.000000000 +0100
+++ bsnes/files/patch-snesfilter-Makefile 2010-07-07 17:57:11.000000000 +0200
@@ -0,0 +1,13 @@
+--- snesfilter/Makefile.orig 2010-02-28 08:05:38.000000000 +0100
++++ snesfilter/Makefile 2010-05-17 08:18:59.000000000 +0200
+@@ -3,8 +3,8 @@
+ qtlibs := QtCore QtGui
+ include nall/qt/Makefile
+
+-c := $(compiler) -std=gnu99
+-cpp := $(subst cc,++,$(compiler)) -std=gnu++0x
++c := $(CC) -std=gnu99
++cpp := $(CXX) -std=gnu++0x
+ flags := -O3 -I. -Iobj -fomit-frame-pointer $(qtinc)
+ link :=
+
diff -uNr /usr/ports/emulators/bsnes/files/patch-snesreader-Makefile bsnes/files/patch-snesreader-Makefile
--- /usr/ports/emulators/bsnes/files/patch-snesreader-Makefile 1970-01-01 01:00:00.000000000 +0100
+++ bsnes/files/patch-snesreader-Makefile 2010-07-07 17:57:11.000000000 +0200
@@ -0,0 +1,13 @@
+--- snesreader/Makefile.orig 2010-05-17 07:48:27.000000000 +0200
++++ snesreader/Makefile 2010-05-17 07:48:45.000000000 +0200
+@@ -3,8 +3,8 @@
+ qtlibs := QtCore QtGui
+ include nall/qt/Makefile
+
+-c := $(compiler) -std=gnu99
+-cpp := $(subst cc,++,$(compiler)) -std=gnu++0x
++c := $(CC) -std=gnu99
++cpp := $(CXX) -std=gnu++0x
+ flags := -O3 -I. -Iobj -fomit-frame-pointer
+ link :=
+
diff -uNr /usr/ports/emulators/bsnes/files/patch-src-Makefile bsnes/files/patch-src-Makefile
--- /usr/ports/emulators/bsnes/files/patch-src-Makefile 1970-01-01 01:00:00.000000000 +0100
+++ bsnes/files/patch-src-Makefile 2010-07-07 17:57:11.000000000 +0200
@@ -0,0 +1,24 @@
+--- src/Makefile.orig 2010-04-14 07:41:49.000000000 +0200
++++ src/Makefile 2010-05-17 07:46:17.000000000 +0200
+@@ -2,9 +2,9 @@
+ ui := ui_qt
+
+ # compiler
+-c := $(compiler) -std=gnu99
+-cpp := $(subst cc,++,$(compiler)) -std=gnu++0x
+-flags := -O3 -fomit-frame-pointer -I.
++c := $(CC)
++cpp := $(CXX)
++flags := -O3 -fomit-frame-pointer -I. -std=c++0x
+ link :=
+ objects :=
+
+@@ -17,7 +17,7 @@
+
+ # platform
+ ifeq ($(platform),x)
+- link += -s -ldl -lX11 -lXext
++ link += -s -lX11 -lXext
+ else ifeq ($(platform),osx)
+ else ifeq ($(platform),win)
+ link += -mwindows -mthreads
diff -uNr /usr/ports/emulators/bsnes/files/patch-src-nall-Makefile bsnes/files/patch-src-nall-Makefile
--- /usr/ports/emulators/bsnes/files/patch-src-nall-Makefile 1970-01-01 01:00:00.000000000 +0100
+++ bsnes/files/patch-src-nall-Makefile 2010-07-07 17:57:11.000000000 +0200
@@ -0,0 +1,11 @@
+--- src/nall/Makefile.orig 2010-04-16 07:04:44.000000000 +0200
++++ src/nall/Makefile 2010-04-16 07:05:00.000000000 +0200
+@@ -32,7 +32,7 @@
+ ifeq ($(platform),osx)
+ compiler := gcc-4.2
+ else
+- compiler := gcc
++ compiler := ${CC}
+ endif
+ endif
+
diff -uNr /usr/ports/emulators/bsnes/files/patch-src-ui_qt-Makefile bsnes/files/patch-src-ui_qt-Makefile
--- /usr/ports/emulators/bsnes/files/patch-src-ui_qt-Makefile 1970-01-01 01:00:00.000000000 +0100
+++ bsnes/files/patch-src-ui_qt-Makefile 2010-07-07 17:57:11.000000000 +0200
@@ -0,0 +1,15 @@
+--- src/ui_qt/Makefile.orig 2010-04-16 07:06:22.000000000 +0200
++++ src/ui_qt/Makefile 2010-04-16 07:06:38.000000000 +0200
+@@ -13,9 +13,9 @@
+
+ # platform
+ ifeq ($(platform),x)
+- ruby := video.glx video.xv video.qtraster video.sdl
+- ruby += audio.alsa audio.openal audio.oss audio.pulseaudio audio.pulseaudiosimple audio.ao
+- ruby += input.sdl input.x
++ ruby := VIDEO
++ ruby += AUDIO
++ ruby += INPUT
+
+ link += $(if $(findstring audio.openal,$(ruby)),-lopenal)
+ else ifeq ($(platform),osx)
diff -uNr /usr/ports/emulators/bsnes/files/patch-src_lib_ruby_audio_ao.cpp bsnes/files/patch-src_lib_ruby_audio_ao.cpp
--- /usr/ports/emulators/bsnes/files/patch-src_lib_ruby_audio_ao.cpp 2010-06-06 22:39:18.000000000 +0200
+++ bsnes/files/patch-src_lib_ruby_audio_ao.cpp 1970-01-01 01:00:00.000000000 +0100
@@ -1,10 +0,0 @@
---- src/lib/ruby/audio/ao.cpp.orig 2010-06-06 18:49:07.000000000 +0200
-+++ src/lib/ruby/audio/ao.cpp 2010-06-06 18:49:30.000000000 +0200
-@@ -51,6 +51,7 @@ public:
- driver_id = ao_default_driver_id(); //ao_driver_id((const char*)driver)
- if(driver_id < 0) return false;
-
-+ memset(&driver_format, 0, sizeof(driver_format));
- driver_format.bits = 16;
- driver_format.channels = 2;
- driver_format.rate = settings.frequency;
diff -uNr /usr/ports/emulators/bsnes/files/patch-supergameboy-Makefile bsnes/files/patch-supergameboy-Makefile
--- /usr/ports/emulators/bsnes/files/patch-supergameboy-Makefile 1970-01-01 01:00:00.000000000 +0100
+++ bsnes/files/patch-supergameboy-Makefile 2010-07-07 17:57:11.000000000 +0200
@@ -0,0 +1,12 @@
+--- supergameboy/Makefile.orig 2010-05-17 07:50:35.000000000 +0200
++++ supergameboy/Makefile 2010-05-17 07:50:45.000000000 +0200
+@@ -1,7 +1,7 @@
+ include nall/Makefile
+
+-c := $(compiler) -std=gnu99
+-cpp := $(subst cc,++,$(compiler)) -std=gnu++0x
++c := $(CC) -std=gnu99
++cpp := $(CXX) -std=gnu++0x
+ flags := -O3 -fomit-frame-pointer -I. -Icommon -Ilibgambatte/include -Ilibgambatte/src
+ link :=
+
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list