Re: UPDATE: snes9x to 1.53
ping? Index: Makefile === RCS file: /cvs/ports/emulators/snes9x/Makefile,v retrieving revision 1.30 diff -u -p -u -r1.30 Makefile --- Makefile2 Apr 2015 14:14:33 - 1.30 +++ Makefile7 May 2016 14:53:11 - @@ -4,12 +4,10 @@ COMMENT = emulates the Super Nintendo En BROKEN-alpha = ICE/failure on filter/hq2x.cpp BROKEN-hppa = ICE/failure on filter/hq2x.cpp -DISTNAME = snes9x-1.52-src +DISTNAME = snes9x-1.53-src PKGNAME = ${DISTNAME:S/-src//} CATEGORIES = emulators games -REVISION = 7 - HOMEPAGE = http://www.snes9x.com/ # non-commercial @@ -22,9 +20,10 @@ WANTLIB =X11 Xau Xcomposite Xcursor Xda gobject-2.0 gthread-2.0 m pango-1.0 pangocairo-1.0 \ pangoft2-1.0 pixman-1 pthread pthread-stubs stdc++ \ xcb xcb-render xcb-render-util z gdk_pixbuf-2.0 \ - glade-2.0 SDL png xml2 gtk-x11-2.0 gdk-x11-2.0 + glade-2.0 intl SDL png xml2 gtk-x11-2.0 gdk-x11-2.0 + +MASTER_SITES = http://www.s9x-w32.de/dl/ -MASTER_SITES = https://sites.google.com/site/bearoso/snes9x/ EXTRACT_SUFX = .tar.bz2 RUN_DEPENDS = devel/desktop-file-utils \ @@ -33,15 +32,12 @@ LIB_DEPENDS = devel/libglade2 \ devel/sdl \ graphics/png \ textproc/libxml \ - x11/gtk+2 + x11/gtk+2 .if ${MACHINE_ARCH} == "i386" -BUILD_DEPENDS = devel/nasm +BUILD_DEPENDS = devel/nasm .endif -MODULES = devel/gettext \ - textproc/intltool - USE_GMAKE =Yes CONFIGURE_STYLE = gnu @@ -49,7 +45,7 @@ CONFIGURE_ARGS = --without-portaudio \ --without-oss \ --without-alsa \ --without-pulseaudio \ ---without-opengl +--without-opengl CONFIGURE_ENV = CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ LIBS="-L${X11BASE}/lib -L${LOCALBASE}/lib" Index: distinfo === RCS file: /cvs/ports/emulators/snes9x/distinfo,v retrieving revision 1.6 diff -u -p -u -r1.6 distinfo --- distinfo18 Jan 2015 03:13:51 - 1.6 +++ distinfo7 May 2016 14:53:11 - @@ -1,2 +1,2 @@ -SHA256 (snes9x-1.52-src.tar.bz2) = NuCbLaYrkhD+siTP0YMEehUaccHV5fknSdwovUt/8cs= -SIZE (snes9x-1.52-src.tar.bz2) = 1720137 +SHA256 (snes9x-1.53-src.tar.bz2) = n3xdLQ+j/nU2Ec+U6Iebc7i7PA6rl828tqtzdu+njcM= +SIZE (snes9x-1.53-src.tar.bz2) = 1838746 Index: patches/patch-gtk_configure === RCS file: /cvs/ports/emulators/snes9x/patches/patch-gtk_configure,v retrieving revision 1.4 diff -u -p -u -r1.4 patch-gtk_configure --- patches/patch-gtk_configure 1 Jun 2013 19:19:16 - 1.4 +++ patches/patch-gtk_configure 7 May 2016 14:53:11 - @@ -1,12 +1,12 @@ $OpenBSD: patch-gtk_configure,v 1.4 2013/06/01 19:19:16 ajacoutot Exp $ gtk/configure.orig Sun Jan 10 18:28:11 2010 -+++ gtk/configure Sun Oct 2 09:23:54 2011 -@@ -2351,7 +2351,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $ - ac_compiler_gnu=$ac_cv_c_compiler_gnu +--- gtk/configure.orig Mon Apr 18 22:33:51 2016 gtk/configure Mon Apr 18 22:34:12 2016 +@@ -6316,7 +6316,7 @@ else + CFLAGS="$CFLAGS -fomit-frame-pointer" + fi +-LIBS="$LIBS -lX11 -ldl -lXext" ++LIBS="$LIBS -lX11 -lXext" --CFLAGS="-O2 -Wall -W -pedantic -Wno-unused-parameter -pipe $CFLAGS" -+CFLAGS="-Wall -W -pedantic -Wno-unused-parameter $CFLAGS" - CXXFLAGS="$CFLAGS" - - ac_ext=c + ZSNESFX='#ZSNESFX=yes' + ZSNESC4='#ZSNESC4=yes' Index: pkg/PLIST === RCS file: /cvs/ports/emulators/snes9x/pkg/PLIST,v retrieving revision 1.6 diff -u -p -u -r1.6 PLIST --- pkg/PLIST 15 Jun 2012 08:32:15 - 1.6 +++ pkg/PLIST 7 May 2016 14:53:11 - @@ -8,19 +8,9 @@ share/doc/snes9x/snapshots.txt share/doc/snes9x/snes9x-license.txt share/examples/snes9x/ share/examples/snes9x/snes9x.conf.default -share/icons/ -share/icons/hicolor/ -share/icons/hicolor/16x16/ -share/icons/hicolor/16x16/apps/ share/icons/hicolor/16x16/apps/snes9x.png -share/icons/hicolor/24x24/ -share/icons/hicolor/24x24/apps/ share/icons/hicolor/24x24/apps/snes9x.png -share/icons/hicolor/32x32/ -share/icons/hicolor/32x32/apps/ share/icons/hicolor/32x32/apps/snes9x.png -share/icons/hicolor/scalable/ -share/icons/hicolor/scalable/apps/ share/icons/hicolor/scalable/apps/snes9x.svg share/locale/es_VE/ share/locale/es_VE/LC_MESSAGES/ @@ -29,8 +19,7 @@ share/locale/fr_FR/ share/locale/fr_FR/LC_MESSAGES/ share/locale/fr_FR/LC_MESSAGES/snes9x-gtk.mo share/locale/pt_BR/LC_MESSAGES/snes9x-gtk.mo -share/locale/sr@latin/ -share/locale/sr@latin/LC_MESSAGES/ +share/locale/ru/LC_MESSAGES/snes9x-gtk.mo share/locale/sr@latin/LC_MESSAGES/snes9x-gtk.mo @exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
Re: UPDATE: snes9x to 1.53
On 2016-05-07 16:59:38, Florian Stinglmayrwrote: > On Sat, May 07, 2016 at 09:32:15PM +0900, Bryan Linton wrote: > > I tried to build it, but some patches fail to apply. I'm running > > a recent -current (it's just GENERIC.MP with the > > PPPOE_TERM_UNKNOWN_SESSIONS option enabled due to my ISP. > > OpenBSD 5.9-current (GENERIC.MP-PPPOE_TERM_UNKNOWN_SESSIONS) #3: Tue > > May 3 11:41:06 JST 2016 > > > > I'm running with a ports tree updated from a similar time frame, > > and I tried updating emulators/snes9x before applying it and it > > still gives me an error. Am I doing something wrong? > > > > Below is an updated patch, could you apply it with -p0 to the current > CVS of ports and try again to build it? > Seems to build and work fine for me. One minor nit: After updating, snes9x seemed to either lose information about some filepaths I had set up, or maybe I never set them up in the first place and the defaults changed. Either way, it only took a second to set them back to where they were supposed to be, and it seems to run fine for me. Unless someone steps up saying this breaks something, I'd say it works well enough to go in. -- Bryan
Re: UPDATE: snes9x to 1.53
On Sat, May 07, 2016 at 09:32:15PM +0900, Bryan Linton wrote: > I tried to build it, but some patches fail to apply. I'm running > a recent -current (it's just GENERIC.MP with the > PPPOE_TERM_UNKNOWN_SESSIONS option enabled due to my ISP. > OpenBSD 5.9-current (GENERIC.MP-PPPOE_TERM_UNKNOWN_SESSIONS) #3: Tue > May 3 11:41:06 JST 2016 > > I'm running with a ports tree updated from a similar time frame, > and I tried updating emulators/snes9x before applying it and it > still gives me an error. Am I doing something wrong? > Below is an updated patch, could you apply it with -p0 to the current CVS of ports and try again to build it? Thanks, Florian Index: Makefile === RCS file: /cvs/ports/emulators/snes9x/Makefile,v retrieving revision 1.30 diff -u -p -u -r1.30 Makefile --- Makefile2 Apr 2015 14:14:33 - 1.30 +++ Makefile7 May 2016 14:53:11 - @@ -4,12 +4,10 @@ COMMENT = emulates the Super Nintendo En BROKEN-alpha = ICE/failure on filter/hq2x.cpp BROKEN-hppa = ICE/failure on filter/hq2x.cpp -DISTNAME = snes9x-1.52-src +DISTNAME = snes9x-1.53-src PKGNAME = ${DISTNAME:S/-src//} CATEGORIES = emulators games -REVISION = 7 - HOMEPAGE = http://www.snes9x.com/ # non-commercial @@ -22,9 +20,10 @@ WANTLIB =X11 Xau Xcomposite Xcursor Xda gobject-2.0 gthread-2.0 m pango-1.0 pangocairo-1.0 \ pangoft2-1.0 pixman-1 pthread pthread-stubs stdc++ \ xcb xcb-render xcb-render-util z gdk_pixbuf-2.0 \ - glade-2.0 SDL png xml2 gtk-x11-2.0 gdk-x11-2.0 + glade-2.0 intl SDL png xml2 gtk-x11-2.0 gdk-x11-2.0 + +MASTER_SITES = http://www.s9x-w32.de/dl/ -MASTER_SITES = https://sites.google.com/site/bearoso/snes9x/ EXTRACT_SUFX = .tar.bz2 RUN_DEPENDS = devel/desktop-file-utils \ @@ -33,15 +32,12 @@ LIB_DEPENDS = devel/libglade2 \ devel/sdl \ graphics/png \ textproc/libxml \ - x11/gtk+2 + x11/gtk+2 .if ${MACHINE_ARCH} == "i386" -BUILD_DEPENDS = devel/nasm +BUILD_DEPENDS = devel/nasm .endif -MODULES = devel/gettext \ - textproc/intltool - USE_GMAKE =Yes CONFIGURE_STYLE = gnu @@ -49,7 +45,7 @@ CONFIGURE_ARGS = --without-portaudio \ --without-oss \ --without-alsa \ --without-pulseaudio \ ---without-opengl +--without-opengl CONFIGURE_ENV = CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ LIBS="-L${X11BASE}/lib -L${LOCALBASE}/lib" Index: distinfo === RCS file: /cvs/ports/emulators/snes9x/distinfo,v retrieving revision 1.6 diff -u -p -u -r1.6 distinfo --- distinfo18 Jan 2015 03:13:51 - 1.6 +++ distinfo7 May 2016 14:53:11 - @@ -1,2 +1,2 @@ -SHA256 (snes9x-1.52-src.tar.bz2) = NuCbLaYrkhD+siTP0YMEehUaccHV5fknSdwovUt/8cs= -SIZE (snes9x-1.52-src.tar.bz2) = 1720137 +SHA256 (snes9x-1.53-src.tar.bz2) = n3xdLQ+j/nU2Ec+U6Iebc7i7PA6rl828tqtzdu+njcM= +SIZE (snes9x-1.53-src.tar.bz2) = 1838746 Index: patches/patch-gtk_configure === RCS file: /cvs/ports/emulators/snes9x/patches/patch-gtk_configure,v retrieving revision 1.4 diff -u -p -u -r1.4 patch-gtk_configure --- patches/patch-gtk_configure 1 Jun 2013 19:19:16 - 1.4 +++ patches/patch-gtk_configure 7 May 2016 14:53:11 - @@ -1,12 +1,12 @@ $OpenBSD: patch-gtk_configure,v 1.4 2013/06/01 19:19:16 ajacoutot Exp $ gtk/configure.orig Sun Jan 10 18:28:11 2010 -+++ gtk/configure Sun Oct 2 09:23:54 2011 -@@ -2351,7 +2351,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $ - ac_compiler_gnu=$ac_cv_c_compiler_gnu +--- gtk/configure.orig Mon Apr 18 22:33:51 2016 gtk/configure Mon Apr 18 22:34:12 2016 +@@ -6316,7 +6316,7 @@ else + CFLAGS="$CFLAGS -fomit-frame-pointer" + fi +-LIBS="$LIBS -lX11 -ldl -lXext" ++LIBS="$LIBS -lX11 -lXext" --CFLAGS="-O2 -Wall -W -pedantic -Wno-unused-parameter -pipe $CFLAGS" -+CFLAGS="-Wall -W -pedantic -Wno-unused-parameter $CFLAGS" - CXXFLAGS="$CFLAGS" - - ac_ext=c + ZSNESFX='#ZSNESFX=yes' + ZSNESC4='#ZSNESC4=yes' Index: pkg/PLIST === RCS file: /cvs/ports/emulators/snes9x/pkg/PLIST,v retrieving revision 1.6 diff -u -p -u -r1.6 PLIST --- pkg/PLIST 15 Jun 2012 08:32:15 - 1.6 +++ pkg/PLIST 7 May 2016 14:53:11 - @@ -8,19 +8,9 @@ share/doc/snes9x/snapshots.txt share/doc/snes9x/snes9x-license.txt share/examples/snes9x/ share/examples/snes9x/snes9x.conf.default -share/icons/ -share/icons/hicolor/ -share/icons/hicolor/16x16/ -share/icons/hicolor/16x16/apps/ share/icons/hicolor/16x16/apps/snes9x.png -share/icons/hicolor/24x24/ -share/icons/hicolor/24x24/apps/
Re: UPDATE: snes9x to 1.53
On 2016-05-07 11:05:00, Florian Stinglmayr <flor...@n0la.org> wrote: > ping? > I tried to build it, but some patches fail to apply. I'm running a recent -current (it's just GENERIC.MP with the PPPOE_TERM_UNKNOWN_SESSIONS option enabled due to my ISP. OpenBSD 5.9-current (GENERIC.MP-PPPOE_TERM_UNKNOWN_SESSIONS) #3: Tue May 3 11:41:06 JST 2016 I'm running with a ports tree updated from a similar time frame, and I tried updating emulators/snes9x before applying it and it still gives me an error. Am I doing something wrong? Hmm... Looks like a unified diff to me... The text leading up to this was: -- |Hi, | |there's nothing better than Lufia II to fill those nights where the code |just won't flow. So below is an update for snes9x to 1.53. The gettext |module is no longer used as well. | |Regards, |Florian | |Index: Makefile |=== |RCS file: /cvs/ports/emulators/snes9x/Makefile,v |retrieving revision 1.30 |diff -u -p -u -r1.30 Makefile |--- Makefile 2 Apr 2015 14:14:33 - 1.30 |+++ Makefile 19 Apr 2016 21:49:40 - -- Patching file Makefile using Plan A... Hunk #1 succeeded at 4. Hunk #2 succeeded at 20. Hunk #3 failed at 32. Hunk #4 failed at 45. 2 out of 4 hunks failed Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -- |Index: distinfo |=== |RCS file: /cvs/ports/emulators/snes9x/distinfo,v |retrieving revision 1.6 |diff -u -p -u -r1.6 distinfo |--- distinfo 18 Jan 2015 03:13:51 - 1.6 |+++ distinfo 19 Apr 2016 21:49:40 - -- Patching file distinfo using Plan A... Hunk #1 succeeded at 1. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -- |Index: patches/patch-gtk_configure |=== |RCS file: /cvs/ports/emulators/snes9x/patches/patch-gtk_configure,v |retrieving revision 1.4 |diff -u -p -u -r1.4 patch-gtk_configure |--- patches/patch-gtk_configure1 Jun 2013 19:19:16 - 1.4 |+++ patches/patch-gtk_configure19 Apr 2016 21:49:40 - -- Patching file patches/patch-gtk_configure using Plan A... Hunk #1 failed at 1. 1 out of 1 hunks failed Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -- |Index: pkg/PLIST |=== |RCS file: /cvs/ports/emulators/snes9x/pkg/PLIST,v |retrieving revision 1.6 |diff -u -p -u -r1.6 PLIST |--- pkg/PLIST 15 Jun 2012 08:32:15 - 1.6 |+++ pkg/PLIST 19 Apr 2016 21:49:40 - -- Patching file pkg/PLIST using Plan A... Hunk #1 succeeded at 8. Hunk #2 succeeded at 19. Hmm... Ignoring the trailing garbage. done -- Bryan
Re: UPDATE: snes9x to 1.53
ping?
UPDATE: snes9x to 1.53
Hi, there's nothing better than Lufia II to fill those nights where the code just won't flow. So below is an update for snes9x to 1.53. The gettext module is no longer used as well. Regards, Florian Index: Makefile === RCS file: /cvs/ports/emulators/snes9x/Makefile,v retrieving revision 1.30 diff -u -p -u -r1.30 Makefile --- Makefile2 Apr 2015 14:14:33 - 1.30 +++ Makefile19 Apr 2016 21:49:40 - @@ -4,12 +4,10 @@ COMMENT = emulates the Super Nintendo En BROKEN-alpha = ICE/failure on filter/hq2x.cpp BROKEN-hppa = ICE/failure on filter/hq2x.cpp -DISTNAME = snes9x-1.52-src +DISTNAME = snes9x-1.53-src PKGNAME = ${DISTNAME:S/-src//} CATEGORIES = emulators games -REVISION = 7 - HOMEPAGE = http://www.snes9x.com/ # non-commercial @@ -22,9 +20,10 @@ WANTLIB =X11 Xau Xcomposite Xcursor Xda gobject-2.0 gthread-2.0 m pango-1.0 pangocairo-1.0 \ pangoft2-1.0 pixman-1 pthread pthread-stubs stdc++ \ xcb xcb-render xcb-render-util z gdk_pixbuf-2.0 \ - glade-2.0 SDL png xml2 gtk-x11-2.0 gdk-x11-2.0 + glade-2.0 intl SDL png xml2 gtk-x11-2.0 gdk-x11-2.0 + +MASTER_SITES = http://www.s9x-w32.de/dl/ -MASTER_SITES = https://sites.google.com/site/bearoso/snes9x/ EXTRACT_SUFX = .tar.bz2 RUN_DEPENDS = devel/desktop-file-utils \ @@ -33,15 +32,12 @@ LIB_DEPENDS = devel/libglade2 \ devel/sdl \ graphics/png \ textproc/libxml \ - x11/gtk+2 + x11/gtk+2 .if ${MACHINE_ARCH} == "i386" -BUILD_DEPENDS = devel/nasm +BUILD_DEPENDS = devel/nasm .endif -MODULES = devel/gettext \ - textproc/intltool - USE_GMAKE =Yes CONFIGURE_STYLE = gnu @@ -49,7 +45,7 @@ CONFIGURE_ARGS = --without-portaudio \ --without-oss \ --without-alsa \ --without-pulseaudio \ ---without-opengl +--without-opengl CONFIGURE_ENV = CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ LIBS="-L${X11BASE}/lib -L${LOCALBASE}/lib" Index: distinfo === RCS file: /cvs/ports/emulators/snes9x/distinfo,v retrieving revision 1.6 diff -u -p -u -r1.6 distinfo --- distinfo18 Jan 2015 03:13:51 - 1.6 +++ distinfo19 Apr 2016 21:49:40 - @@ -1,2 +1,2 @@ -SHA256 (snes9x-1.52-src.tar.bz2) = NuCbLaYrkhD+siTP0YMEehUaccHV5fknSdwovUt/8cs= -SIZE (snes9x-1.52-src.tar.bz2) = 1720137 +SHA256 (snes9x-1.53-src.tar.bz2) = n3xdLQ+j/nU2Ec+U6Iebc7i7PA6rl828tqtzdu+njcM= +SIZE (snes9x-1.53-src.tar.bz2) = 1838746 Index: patches/patch-gtk_configure === RCS file: /cvs/ports/emulators/snes9x/patches/patch-gtk_configure,v retrieving revision 1.4 diff -u -p -u -r1.4 patch-gtk_configure --- patches/patch-gtk_configure 1 Jun 2013 19:19:16 - 1.4 +++ patches/patch-gtk_configure 19 Apr 2016 21:49:40 - @@ -1,12 +1,12 @@ $OpenBSD: patch-gtk_configure,v 1.4 2013/06/01 19:19:16 ajacoutot Exp $ gtk/configure.orig Sun Jan 10 18:28:11 2010 -+++ gtk/configure Sun Oct 2 09:23:54 2011 -@@ -2351,7 +2351,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $ - ac_compiler_gnu=$ac_cv_c_compiler_gnu +--- gtk/configure.orig Mon Apr 18 22:33:51 2016 gtk/configure Mon Apr 18 22:34:12 2016 +@@ -6316,7 +6316,7 @@ else + CFLAGS="$CFLAGS -fomit-frame-pointer" + fi +-LIBS="$LIBS -lX11 -ldl -lXext" ++LIBS="$LIBS -lX11 -lXext" --CFLAGS="-O2 -Wall -W -pedantic -Wno-unused-parameter -pipe $CFLAGS" -+CFLAGS="-Wall -W -pedantic -Wno-unused-parameter $CFLAGS" - CXXFLAGS="$CFLAGS" - - ac_ext=c + ZSNESFX='#ZSNESFX=yes' + ZSNESC4='#ZSNESC4=yes' Index: pkg/PLIST === RCS file: /cvs/ports/emulators/snes9x/pkg/PLIST,v retrieving revision 1.6 diff -u -p -u -r1.6 PLIST --- pkg/PLIST 15 Jun 2012 08:32:15 - 1.6 +++ pkg/PLIST 19 Apr 2016 21:49:40 - @@ -8,19 +8,9 @@ share/doc/snes9x/snapshots.txt share/doc/snes9x/snes9x-license.txt share/examples/snes9x/ share/examples/snes9x/snes9x.conf.default -share/icons/ -share/icons/hicolor/ -share/icons/hicolor/16x16/ -share/icons/hicolor/16x16/apps/ share/icons/hicolor/16x16/apps/snes9x.png -share/icons/hicolor/24x24/ -share/icons/hicolor/24x24/apps/ share/icons/hicolor/24x24/apps/snes9x.png -share/icons/hicolor/32x32/ -share/icons/hicolor/32x32/apps/ share/icons/hicolor/32x32/apps/snes9x.png -share/icons/hicolor/scalable/ -share/icons/hicolor/scalable/apps/ share/icons/hicolor/scalable/apps/snes9x.svg share/locale/es_VE/ share/locale/es_VE/LC_MESSAGES/ @@ -29,8 +19,7 @@ share/locale/fr_FR/ share/locale/fr_FR/LC_MESSAGES/ share/locale/fr_FR/LC_M