[update/unbreak] emulators/vbam 2.1.1 -> 2.3.3

classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|

[update/unbreak] emulators/vbam 2.1.1 -> 2.3.3

Charlene Wendling

It all started with this:

> http://build-failures.rhaalovely.net/powerpc/last/emulators/vbam.log
> http://build-failures.rhaalovely.net/sparc64/last/emulators/vbam.log

We don't ship the required file since, as far i as understand, we don't
ship OpenMP. So it was needed to remove -fopenmp. It actually fixed the
build but runtime generates blank screens, so i tried an update that
didn't solve the issue, but the update is still worthy.

It's a big changelog with mostly bug fixes, see here [0].

Ports changes:

- move HOMEPAGE to https, and to PERMIT_PACKAGE
- prevent the killing of numerous kittens by removing
  "-Wno-c++11-narrowing". As gcc-8 is now as good as clang to find
  narrowing errors, i don't expect a failure on arm*. Actually there
  were no narrowing errors to start with.
- add a patch that removes -fopenmp

Testing:

- amd64: builds fine, various GB/GBA roms tested without issues.
- macppc: builds fine, runtime is broken as described above.
          I've looked at the source code, and there are many
                clear big-endian FIXME entries in the code.


Comments/feedback are welcome!

Charlène.
       

[0] https://github.com/visualboyadvance-m/visualboyadvance-m/releases


Index: Makefile
===================================================================
RCS file: /cvs/ports/emulators/vbam/Makefile,v
retrieving revision 1.31
diff -u -p -u -p -r1.31 Makefile
--- Makefile 20 May 2019 22:15:09 -0000 1.31
+++ Makefile 2 Jul 2019 17:31:44 -0000
@@ -7,16 +7,15 @@ COMMENT = emulator for Nintendo Game Bo
 
 GH_ACCOUNT = visualboyadvance-m
 GH_PROJECT = ${GH_ACCOUNT}
-GH_TAGNAME = v2.1.1
-REVISION = 1
+GH_TAGNAME = v2.1.3
 PKGNAME = vbam-${GH_TAGNAME:S/v//}
 
 CATEGORIES = emulators
 
-HOMEPAGE = http://www.vba-m.com
+HOMEPAGE = https://www.vba-m.com
 
 # GPLv2+ (see doc/License.txt)
-PERMIT_PACKAGE_CDROM = Yes
+PERMIT_PACKAGE = Yes
 
 WANTLIB += ${COMPILER_LIBCXX}
 WANTLIB += GL GLU SDL2 c iconv intl m png sfml-network sfml-system
@@ -43,7 +42,7 @@ CONFIGURE_ARGS += -DENABLE_LTO=OFF
 # -DCMAKE_ASM_NASM_COMPILER=yasm, but then linking fails.
 CONFIGURE_ARGS += -DENABLE_ASM=OFF
 
-CXXFLAGS += -Wno-c++11-narrowing -I${X11BASE}/include
+CXXFLAGS += -I${X11BASE}/include
 
 NO_TEST = Yes
 
Index: distinfo
===================================================================
RCS file: /cvs/ports/emulators/vbam/distinfo,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 distinfo
--- distinfo 1 Apr 2019 06:39:22 -0000 1.5
+++ distinfo 2 Jul 2019 17:31:44 -0000
@@ -1,2 +1,2 @@
-SHA256 (visualboyadvance-m-2.1.1.tar.gz) = L/suYHOqOIA6K1kxnSOw7Mp/HhKE74S7HRBtnRp1ncI=
-SIZE (visualboyadvance-m-2.1.1.tar.gz) = 3758035
+SHA256 (visualboyadvance-m-2.1.3.tar.gz) = xkqLQA6a+GLgvnQUh2Cnxz+Y0I3Lt9AeyoHm3FrTdv0=
+SIZE (visualboyadvance-m-2.1.3.tar.gz) = 3768007
Index: patches/patch-CMakeLists_txt
===================================================================
RCS file: patches/patch-CMakeLists_txt
diff -N patches/patch-CMakeLists_txt
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-CMakeLists_txt 2 Jul 2019 17:31:44 -0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Fix build with ports-gcc:
+eg++: error: libgomp.spec: No such file or directory
+
+Index: CMakeLists.txt
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -471,7 +471,6 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID S
+             endif()
+         endif()
+
+-        set(MY_C_FLAGS ${MY_C_FLAGS} -fopenmp)
+     endif()
+
+     if(CMAKE_CXX_COMPILER_ID STREQUAL GNU)





Reply | Threaded
Open this post in threaded view
|

Re: [update/unbreak] emulators/vbam 2.1.1 -> 2.3.3

Charlene Wendling
Ping. I'm still wondering if it should be ONLY_FOR_ARCHS = ${LE_ARCHS}
as well.

On Tue, 2 Jul 2019 19:49:46 +0200
Charlene Wendling wrote:

>
> It all started with this:
>
> > http://build-failures.rhaalovely.net/powerpc/last/emulators/vbam.log
> > http://build-failures.rhaalovely.net/sparc64/last/emulators/vbam.log
>
> We don't ship the required file since, as far i as understand, we
> don't ship OpenMP. So it was needed to remove -fopenmp. It actually
> fixed the build but runtime generates blank screens, so i tried an
> update that didn't solve the issue, but the update is still worthy.
>
> It's a big changelog with mostly bug fixes, see here [0].
>
> Ports changes:
>
> - move HOMEPAGE to https, and to PERMIT_PACKAGE
> - prevent the killing of numerous kittens by removing
>   "-Wno-c++11-narrowing". As gcc-8 is now as good as clang to find
>   narrowing errors, i don't expect a failure on arm*. Actually there
>   were no narrowing errors to start with.
> - add a patch that removes -fopenmp
>
> Testing:
>
> - amd64: builds fine, various GB/GBA roms tested without
> issues.
> - macppc: builds fine, runtime is broken as described above.
>           I've looked at the source code, and there are many
> clear big-endian FIXME entries in the code.
>
>
> Comments/feedback are welcome!
>
> Charlène.
>
>
> [0] https://github.com/visualboyadvance-m/visualboyadvance-m/releases
>

Index: Makefile
===================================================================
RCS file: /cvs/ports/emulators/vbam/Makefile,v
retrieving revision 1.31
diff -u -p -u -p -r1.31 Makefile
--- Makefile 20 May 2019 22:15:09 -0000 1.31
+++ Makefile 2 Jul 2019 17:31:44 -0000
@@ -7,16 +7,15 @@ COMMENT = emulator for Nintendo Game Bo
 
 GH_ACCOUNT = visualboyadvance-m
 GH_PROJECT = ${GH_ACCOUNT}
-GH_TAGNAME = v2.1.1
-REVISION = 1
+GH_TAGNAME = v2.1.3
 PKGNAME = vbam-${GH_TAGNAME:S/v//}
 
 CATEGORIES = emulators
 
-HOMEPAGE = http://www.vba-m.com
+HOMEPAGE = https://www.vba-m.com
 
 # GPLv2+ (see doc/License.txt)
-PERMIT_PACKAGE_CDROM = Yes
+PERMIT_PACKAGE = Yes
 
 WANTLIB += ${COMPILER_LIBCXX}
 WANTLIB += GL GLU SDL2 c iconv intl m png sfml-network sfml-system
@@ -43,7 +42,7 @@ CONFIGURE_ARGS += -DENABLE_LTO=OFF
 # -DCMAKE_ASM_NASM_COMPILER=yasm, but then linking fails.
 CONFIGURE_ARGS += -DENABLE_ASM=OFF
 
-CXXFLAGS += -Wno-c++11-narrowing -I${X11BASE}/include
+CXXFLAGS += -I${X11BASE}/include
 
 NO_TEST = Yes
 
Index: distinfo
===================================================================
RCS file: /cvs/ports/emulators/vbam/distinfo,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 distinfo
--- distinfo 1 Apr 2019 06:39:22 -0000 1.5
+++ distinfo 2 Jul 2019 17:31:44 -0000
@@ -1,2 +1,2 @@
-SHA256 (visualboyadvance-m-2.1.1.tar.gz) = L/suYHOqOIA6K1kxnSOw7Mp/HhKE74S7HRBtnRp1ncI=
-SIZE (visualboyadvance-m-2.1.1.tar.gz) = 3758035
+SHA256 (visualboyadvance-m-2.1.3.tar.gz) = xkqLQA6a+GLgvnQUh2Cnxz+Y0I3Lt9AeyoHm3FrTdv0=
+SIZE (visualboyadvance-m-2.1.3.tar.gz) = 3768007
Index: patches/patch-CMakeLists_txt
===================================================================
RCS file: patches/patch-CMakeLists_txt
diff -N patches/patch-CMakeLists_txt
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-CMakeLists_txt 2 Jul 2019 17:31:44 -0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Fix build with ports-gcc:
+eg++: error: libgomp.spec: No such file or directory
+
+Index: CMakeLists.txt
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -471,7 +471,6 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID S
+             endif()
+         endif()
+
+-        set(MY_C_FLAGS ${MY_C_FLAGS} -fopenmp)
+     endif()
+
+     if(CMAKE_CXX_COMPILER_ID STREQUAL GNU)