~alpine/aports

This thread contains a patchset. You're looking at the original emails, but you may wish to use the patch review UI. Review patch
2 2

[alpine-aports] [PATCH] testing/mednafen: update to 0.9.37.1

AmatCoder <amatcoder@gmail.com>
Details
Message ID
<1421973207-7652-1-git-send-email-amatcoder@gmail.com>
Sender timestamp
1421973207
DKIM signature
missing
Download raw message
9 years ago
Patch: +29 -29 
---
 testing/mednafen/01-fix_help.patch       |  6 +++---
 testing/mednafen/02-sdl_by_default.patch | 20 ++++++++++----------
 testing/mednafen/03-fix_textrels.patch   |  4 ++--
 testing/mednafen/APKBUILD                | 28 ++++++++++++++--------------
 4 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/testing/mednafen/01-fix_help.patch b/testing/mednafen/01-fix_help.patch
index 48c35d7..30abef5 100644
--- a/testing/mednafen/01-fix_help.patch
+++ b/testing/mednafen/01-fix_help.patch
@@ -1,6 +1,6 @@
--- origin/src/drivers/main.cpp
--- mednafen-origin/src/drivers/main.cpp
+++ mednafen/src/drivers/main.cpp
@@ -696,7 +696,7 @@
@@ -582,7 +582,7 @@
 	if(argc <= 1)
 	{
 	 printf(_("No command-line arguments specified.\n\n"));
@@ -9,7 +9,7 @@
 	 printf(_("\tPlease refer to the documentation for option parameters and usage.\n\n"));
 	 return(0);
 	}
@@ -713,11 +713,11 @@
@@ -599,11 +599,11 @@
 
 	 if(ShowCLHelp)
 	 {
diff --git a/testing/mednafen/02-sdl_by_default.patch b/testing/mednafen/02-sdl_by_default.patch
index e5c10e5..8a14c39 100644
--- a/testing/mednafen/02-sdl_by_default.patch
+++ b/testing/mednafen/02-sdl_by_default.patch
@@ -1,11 +1,11 @@
--- origin/include/mednafen/drivers/main.cpp
+++ mednafen/include/mednafen/drivers/main.cpp
@@ -183,7 +183,7 @@
   { "netplay.smallfont", MDFNSF_NOFLAGS, gettext_noop("Use small(tiny!) font for netplay chat console."), NULL, MDFNST_BOOL, "0" },
--- mednafen-origin/src/drivers/video.cpp
+++ mednafen/src/drivers/video.cpp
@@ -147,7 +147,7 @@
 
   { "video.fs", MDFNSF_NOFLAGS, gettext_noop("Enable fullscreen mode."), NULL, MDFNST_BOOL, "0", },
-  { "video.driver", MDFNSF_NOFLAGS, gettext_noop("Video output method/driver."), NULL, MDFNST_ENUM, "opengl", NULL, NULL, NULL,NULL, VDriver_List },
+  { "video.driver", MDFNSF_NOFLAGS, gettext_noop("Video output method/driver."), NULL, MDFNST_ENUM, "sdl", NULL, NULL, NULL,NULL, VDriver_List },
   { "video.glvsync", MDFNSF_NOFLAGS, gettext_noop("Attempt to synchronize OpenGL page flips to vertical retrace period."), 
 			       gettext_noop("Note: Additionally, if the environment variable \"__GL_SYNC_TO_VBLANK\" does not exist, then it will be created and set to the value specified for this setting.  This has the effect of forcibly enabling or disabling vblank synchronization when running under Linux with NVidia's drivers."),
 				MDFNST_BOOL, "1" },
 static MDFNSetting GlobalVideoSettings[] =
 {
- { "video.driver", MDFNSF_NOFLAGS, gettext_noop("Video output method/driver."), NULL, MDFNST_ENUM, "opengl", NULL, NULL, NULL, NULL, VDriver_List },
+ { "video.driver", MDFNSF_NOFLAGS, gettext_noop("Video output method/driver."), NULL, MDFNST_ENUM, "sdl", NULL, NULL, NULL, NULL, VDriver_List },
 
  { "video.fs", MDFNSF_NOFLAGS, gettext_noop("Enable fullscreen mode."), NULL, MDFNST_BOOL, "0", },
  { "video.glvsync", MDFNSF_NOFLAGS, gettext_noop("Attempt to synchronize OpenGL page flips to vertical retrace period."), 
diff --git a/testing/mednafen/03-fix_textrels.patch b/testing/mednafen/03-fix_textrels.patch
index 1ebbea5..036a6af 100644
--- a/testing/mednafen/03-fix_textrels.patch
+++ b/testing/mednafen/03-fix_textrels.patch
@@ -1,6 +1,6 @@
--- origin/configure
--- mednafen-origin/configure
+++ mednafen/configure
@@ -26907,7 +26907,7 @@
@@ -26618,7 +26618,7 @@
 fi
 
 
diff --git a/testing/mednafen/APKBUILD b/testing/mednafen/APKBUILD
index bc058fa..e8bf9fc 100644
--- a/testing/mednafen/APKBUILD
+++ b/testing/mednafen/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: August Klein <amatcoder@gmail.com>
# Maintainer: August Klein <amatcoder@gmail.com>
pkgname=mednafen
pkgver=0.9.36.5
pkgrel=3
pkgver=0.9.37.1
pkgrel=0
pkgdesc="A command-line multi-system emulator"
url="http://mednafen.sourceforge.net"
arch="all"
@@ -58,15 +58,15 @@ __EOF__
	paxctl -c -m "$pkgdir"/usr/bin/mednafen-bin
}

md5sums="a0841f0073322414858c22e247344502  mednafen-0.9.36.5.tar.bz2
259d9396e292b0446f3837799c3ff091  01-fix_help.patch
af94272d82816ca74db585c7c5f96bf6  02-sdl_by_default.patch
355403c74108baaa6b65fc5521c87be0  03-fix_textrels.patch"
sha256sums="1f3ac7dd705e71a77ccbac0e74e07609bb90b15dfdce04d8f452d8cddd878d0e  mednafen-0.9.36.5.tar.bz2
511509758cd80cb2472bc95a8c790ae69565869a081a6d70acffb5d57c6c4b4a  01-fix_help.patch
22744df0ece6e67d2c61d8f014e3dbe65d3f425819be742e547a07e676efc5ee  02-sdl_by_default.patch
36d96b1e5829a67e7458a338d3c296e56f1cae5f3ba11453949be7e7ef52ed02  03-fix_textrels.patch"
sha512sums="76e8534f91f70100d0e0c0c3e490c71929cce24b47880d1271eaf7d581ec488427194c23ba96d6400ad4d0a80134479442b8a5448776d484dbf4d1940deb61da  mednafen-0.9.36.5.tar.bz2
80e549698687fbe61021ccf964979bb83243ba86d5651fb648ca134822b6b0147c79d0491d076cdfbd579236b5e9db314fcda6d0df46b17a4e856e3677314c56  01-fix_help.patch
ab52224218c972a2f5f470ad5fe2db7fc37422466c1edd3c6170feefafbf6b55c83b5f92b09fc86648444e835a8b38b0a773b9aae462fa5d3a3c203ef534c574  02-sdl_by_default.patch
361522814a514c7bb21c3d3c3451b80817a6de80c224f839071590ae6469a994e144100b67f7e33d4259e4dd3af6b115fe8e12470aaff143920b8193e54db343  03-fix_textrels.patch"
md5sums="79d4694f0234cd457324271a58b665a6  mednafen-0.9.37.1.tar.bz2
60e47c51854757a5f11942c993ced8e1  01-fix_help.patch
7ec3e428d5b52df40783c6375f0c3f83  02-sdl_by_default.patch
a1e539ab1fe48182c5ce650235bdfc1c  03-fix_textrels.patch"
sha256sums="5fdf573c4166d16b430b729595d1b548e5f3163e84f348474b3c94b9156e2dc3  mednafen-0.9.37.1.tar.bz2
bb34b3c8e8a63429bdcc3f09a3120bfe002f1ff36063668488527a63c56c1740  01-fix_help.patch
5ec0f0c562cd127afa58a1036f2993e792aa766c313f6b0dbb3ccab290b6178b  02-sdl_by_default.patch
d29cf8dd7638c3ce04aa164e83fe09eba4258daada77634c320340d7eae7dd49  03-fix_textrels.patch"
sha512sums="ef13045bc26ff82e0173793be1a7e880df4eec0aa841da17fd58fc993353bf8311556f22c105a4a46b24686f7572d08c9d8e8383669af2688434a39ec22055f2  mednafen-0.9.37.1.tar.bz2
eaecdfef893bc8643bf35f4d13efad3bc386f562218746958c20f301fea19bfbd79b1f156c4063a464e95e239b4e2149e7a2d706cb30b746bb7115b6518d4a7b  01-fix_help.patch
9cf7cc74893a0d790f9ec7db696dccc49ac6de134d773d1fbf32caf3573a1d5f00faad5cdaffa3f113cc005136a81da4c3de9667e6f6d9f6bb67fe154ff8cf84  02-sdl_by_default.patch
0c621352faad0eee1632f85dcb646e53c6b9dd76f4f123ba461b2e2b5e9aa0ab022a0399480ef1a28636110467914c85822252c80ad1ad67324e2f83b30e1a6b  03-fix_textrels.patch"
-- 
2.2.2



---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---
Natanael Copa <ncopa@alpinelinux.org>
Details
Message ID
<20150125123432.57aa60b8@ncopa-laptop>
In-Reply-To
<1421973207-7652-1-git-send-email-amatcoder@gmail.com> (view parent)
Sender timestamp
1422185672
DKIM signature
missing
Download raw message
9 years ago 
On Fri, 23 Jan 2015 00:33:27 +0000
AmatCoder <amatcoder@gmail.com> wrote:

> ---
>  testing/mednafen/01-fix_help.patch       |  6 +++---
>  testing/mednafen/02-sdl_by_default.patch | 20 ++++++++++----------
>  testing/mednafen/03-fix_textrels.patch   |  4 ++--
>  testing/mednafen/APKBUILD                | 28 ++++++++++++++--------------
>  4 files changed, 29 insertions(+), 29 deletions(-)

This failed on x86_64 with:

make[2]: Entering directory '/home/ncopa/aports/testing/mednafen/src/mednafen/src'
depbase=`echo hash/sha1.o | sed 's|[^/]*$|.deps/&|;s|\.o$||'`;\
ccache g++ -DLOCALEDIR=\"/usr/share/locale\" -DHAVE_CONFIG_H -I../include -I../include -I../intl   -Os -fomit-frame-pointer  -fsigned-char  -Wall -Wshadow -Wemp
ty-body -Wignored-qualifiers  -fno-fast-math -fno-unsafe-math-optimizations -fno
-aggressive-loop-optimizations -fomit-frame-pointer -fwrapv  -Os -fomit-frame-po
inter -std=gnu++11 -MT hash/sha1.o -MD -MP -MF $depbase.Tpo -c -o hash/sha1.o hash/sha1.cpp &&\
mv -f $depbase.Tpo $depbase.Po
hash/sha1.cpp:161:112: error: invalid digit "9" in octal constant
  assert(sha1(tv, 65) == "079b9ef0684bd9a600b9a23caa4297d064ce076e"_sha1);
                                                                                
                                ^



---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---
Amat Coder <amatcoder@gmail.com>
Details
Message ID
<CAHLLVvEMGiDR-C8y0PjCp2iS9pV0ep+AxsAdejJbSZHpD-j74A@mail.gmail.com>
In-Reply-To
<20150125123432.57aa60b8@ncopa-laptop> (view parent)
Sender timestamp
1422199800
DKIM signature
missing
Download raw message
9 years ago 
2015-01-25 11:34 GMT+00:00 Natanael Copa <ncopa@alpinelinux.org>:
>
> On Fri, 23 Jan 2015 00:33:27 +0000
> AmatCoder <amatcoder@gmail.com> wrote:
>
> > ---
> >  testing/mednafen/01-fix_help.patch       |  6 +++---
> >  testing/mednafen/02-sdl_by_default.patch | 20 ++++++++++----------
> >  testing/mednafen/03-fix_textrels.patch   |  4 ++--
> >  testing/mednafen/APKBUILD                | 28
++++++++++++++--------------
> >  4 files changed, 29 insertions(+), 29 deletions(-)
>
> This failed on x86_64 with:
>
> make[2]: Entering directory
'/home/ncopa/aports/testing/mednafen/src/mednafen/src'
> depbase=`echo hash/sha1.o | sed 's|[^/]*$|.deps/&|;s|\.o$||'`;\
> ccache g++ -DLOCALEDIR=\"/usr/share/locale\" -DHAVE_CONFIG_H -I../include
-I../include -I../intl   -Os -fomit-frame-pointer  -fsigned-char  -Wall
-Wshadow -Wemp
> ty-body -Wignored-qualifiers  -fno-fast-math
-fno-unsafe-math-optimizations -fno
> -aggressive-loop-optimizations -fomit-frame-pointer -fwrapv  -Os
-fomit-frame-po
> inter -std=gnu++11 -MT hash/sha1.o -MD -MP -MF $depbase.Tpo -c -o
hash/sha1.o hash/sha1.cpp &&\
> mv -f $depbase.Tpo $depbase.Po
> hash/sha1.cpp:161:112: error: invalid digit "9" in octal constant
>   assert(sha1(tv, 65) == "079b9ef0684bd9a600b9a23caa4297d064ce076e"_sha1);
>

Hmm, weird...
I was able to reproduce that error with ccache, but it works fine without
it.
Have we caught a bug from ccache? :-/
Reply to thread Export thread (mbox)