[-- Attachment #1: Type: text/plain, Size: 1229 bytes --] There is a new pull request by ypsvlq against master on the void-packages repository https://github.com/ypsvlq/void-packages fs-uae https://github.com/void-linux/void-packages/pull/36924 fs-uae: update to 3.1.66. <!-- Uncomment relevant sections and delete options which are not applicable --> #### Testing the changes - I tested the changes in this PR: **YES** <!-- #### New package - This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO** --> <!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration and test at least one native build and, if supported, at least one cross build. Ignore this section if this PR is not skipping CI. --> <!-- #### Local build testing - I built this PR locally for my native architecture, (ARCH-LIBC) - I built this PR locally for these architectures (if supported. mark crossbuilds): - aarch64-musl - armv7l - armv6l-musl --> A patch file from https://github.com/void-linux/void-packages/pull/36924.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-fs-uae-36924.patch --] [-- Type: text/x-diff, Size: 3157 bytes --] From bb11f7075ec3a81a3e2eabb71a8568392b0aec35 Mon Sep 17 00:00:00 2001 From: Elaine Gibson <ypsvlq@gmail.com> Date: Sat, 30 Apr 2022 18:11:52 +0100 Subject: [PATCH] fs-uae: update to 3.1.66. --- srcpkgs/fs-uae/files/fs-uae.desktop | 11 ------- srcpkgs/fs-uae/template | 45 ++++++++++++++++------------- 2 files changed, 25 insertions(+), 31 deletions(-) delete mode 100644 srcpkgs/fs-uae/files/fs-uae.desktop diff --git a/srcpkgs/fs-uae/files/fs-uae.desktop b/srcpkgs/fs-uae/files/fs-uae.desktop deleted file mode 100644 index 388c561065dc..000000000000 --- a/srcpkgs/fs-uae/files/fs-uae.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Name=FS-UAE -Comment=FS-UAE Amiga Emulator -TryExec=fs-uae -Exec=fs-uae %f -StartupNotify=true -Terminal=false -Type=Application -Icon=fs-uae -Categories=Applications;Emulators;Game - diff --git a/srcpkgs/fs-uae/template b/srcpkgs/fs-uae/template index b4387082e153..dc1e04d092a3 100644 --- a/srcpkgs/fs-uae/template +++ b/srcpkgs/fs-uae/template @@ -1,36 +1,41 @@ # Template file for 'fs-uae' pkgname=fs-uae -version=3.0.5 +version=3.1.66 revision=1 build_style=gnu-configure -hostmakedepends="automake gettext libtool pkg-config zip" -makedepends="glew-devel libmpeg2-devel SDL2-devel MesaLib-devel - freetype-devel libglib-devel libpng-devel libopenal-devel" -depends="desktop-file-utils hicolor-icon-theme" +hostmakedepends="pkg-config gettext zip" +makedepends="libmpeg2-devel SDL2-devel libglib-devel libpng-devel libopenal-devel" short_desc="FS-UAE Amiga Emulator" maintainer="Orphaned <orphan@voidlinux.org>" license="GPL-2.0-only" homepage="https://fs-uae.net" -distfiles="https://fs-uae.net/stable/${version}/${pkgname}-${version}.tar.gz" -checksum=f26ec42e03cf1a7b53b6ce0d9845aa45bbf472089b5ec046b3eb784ec6859fe3 -nocross="./gen/genlinetoscr: cannot execute binary file: Exec format error" -nopie=yes +distfiles="https://fs-uae.net/files/FS-UAE/Stable/${version}/${pkgname}-${version}.tar.xz" +checksum=606e1868b500413d69bd33bb469f8fd08d6c08988801f17b7dd022f3fbe23832 case "$XBPS_TARGET_MACHINE" in - x86_64*|i686*) ;; + x86_64*|i686*) nopie=yes ;; *) configure_args+=" --disable-jit" ;; esac -CFLAGS="-Wno-error -Wno-narrowing -Wno-alloc-size-larget-than" -CXXFLAGS="${CFLAGS}" +if [ "$CROSS_BUILD" ]; then + post_configure() { + make $makejobs \ + CC=$CC_FOR_BUILD CFLAGS=$CFLAGS_FOR_BULID \ + CXX=$CXX_FOR_BUILD CXXFLAGS=$CXXFLAGS_FOR_BUILD \ + LIBS= GLIB_LIBS= LIBMPEG2_LIBS= OPENAL_LIBS= \ + OPENGL_LIBS= PNG_LIBS= SDL2_LIBS= X11_LIBS= ZLIB_LIBS= \ + gen/blit.h gen/blitfunc.cpp gen/blitfunc.h gen/blittable.cpp \ + gen/compemu.cpp gen/cpudefs.cpp gen/cpuemu_0.cpp \ + gen/linetoscr.cpp -pre_configure() { - grep -rlw -- -Werror | xargs -n1 -t -I% sed -i % -e "s;-Werror;-Wno-error;" - autoreconf -fi - cd libmpeg2 - autoreconf -fi -} + rm src/readcpu.o gen/cpudefs.o + make $makejobs src/readcpu.o gen/cpudefs.o + touch gen/* + } +fi -post_install() { - vinstall ${FILESDIR}/fs-uae.desktop 644 usr/share/applications +post_extract() { + case "$XBPS_TARGET_MACHINE" in + *-musl) sed -i -e 's/| RTLD_DEEPBIND//' src/dlopen.cpp ;; + esac }
[-- Attachment #1: Type: text/plain, Size: 1234 bytes --] There is an updated pull request by ypsvlq against master on the void-packages repository https://github.com/ypsvlq/void-packages fs-uae https://github.com/void-linux/void-packages/pull/36924 fs-uae: update to 3.1.66. <!-- Uncomment relevant sections and delete options which are not applicable --> #### Testing the changes - I tested the changes in this PR: **YES** <!-- #### New package - This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO** --> <!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration and test at least one native build and, if supported, at least one cross build. Ignore this section if this PR is not skipping CI. --> <!-- #### Local build testing - I built this PR locally for my native architecture, (ARCH-LIBC) - I built this PR locally for these architectures (if supported. mark crossbuilds): - aarch64-musl - armv7l - armv6l-musl --> A patch file from https://github.com/void-linux/void-packages/pull/36924.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-fs-uae-36924.patch --] [-- Type: text/x-diff, Size: 3219 bytes --] From abaec6ee7003fbf4c5596e57ddce9c1c5252197c Mon Sep 17 00:00:00 2001 From: Elaine Gibson <ypsvlq@gmail.com> Date: Sat, 30 Apr 2022 18:11:52 +0100 Subject: [PATCH] fs-uae: update to 3.1.66. --- srcpkgs/fs-uae/files/fs-uae.desktop | 11 ------- srcpkgs/fs-uae/template | 46 ++++++++++++++++------------- 2 files changed, 26 insertions(+), 31 deletions(-) delete mode 100644 srcpkgs/fs-uae/files/fs-uae.desktop diff --git a/srcpkgs/fs-uae/files/fs-uae.desktop b/srcpkgs/fs-uae/files/fs-uae.desktop deleted file mode 100644 index 388c561065dc..000000000000 --- a/srcpkgs/fs-uae/files/fs-uae.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Name=FS-UAE -Comment=FS-UAE Amiga Emulator -TryExec=fs-uae -Exec=fs-uae %f -StartupNotify=true -Terminal=false -Type=Application -Icon=fs-uae -Categories=Applications;Emulators;Game - diff --git a/srcpkgs/fs-uae/template b/srcpkgs/fs-uae/template index b4387082e153..71a4a706918a 100644 --- a/srcpkgs/fs-uae/template +++ b/srcpkgs/fs-uae/template @@ -1,36 +1,42 @@ # Template file for 'fs-uae' pkgname=fs-uae -version=3.0.5 +version=3.1.66 revision=1 build_style=gnu-configure -hostmakedepends="automake gettext libtool pkg-config zip" -makedepends="glew-devel libmpeg2-devel SDL2-devel MesaLib-devel - freetype-devel libglib-devel libpng-devel libopenal-devel" -depends="desktop-file-utils hicolor-icon-theme" +hostmakedepends="pkg-config gettext zip" +makedepends="libmpeg2-devel SDL2-devel libglib-devel libpng-devel libopenal-devel" short_desc="FS-UAE Amiga Emulator" maintainer="Orphaned <orphan@voidlinux.org>" license="GPL-2.0-only" homepage="https://fs-uae.net" -distfiles="https://fs-uae.net/stable/${version}/${pkgname}-${version}.tar.gz" -checksum=f26ec42e03cf1a7b53b6ce0d9845aa45bbf472089b5ec046b3eb784ec6859fe3 -nocross="./gen/genlinetoscr: cannot execute binary file: Exec format error" -nopie=yes +distfiles="https://fs-uae.net/files/FS-UAE/Stable/${version}/${pkgname}-${version}.tar.xz" +checksum=606e1868b500413d69bd33bb469f8fd08d6c08988801f17b7dd022f3fbe23832 case "$XBPS_TARGET_MACHINE" in - x86_64*|i686*) ;; + x86_64*|i686*) nopie=yes ;; *) configure_args+=" --disable-jit" ;; esac -CFLAGS="-Wno-error -Wno-narrowing -Wno-alloc-size-larget-than" -CXXFLAGS="${CFLAGS}" +if [ "$CROSS_BUILD" ]; then + post_configure() { + make $makejobs \ + CC=$CC_FOR_BUILD CFLAGS=$CFLAGS_FOR_BULID \ + CXX=$CXX_FOR_BUILD CXXFLAGS=$CXXFLAGS_FOR_BUILD \ + LIBS= GLIB_LIBS= LIBMPEG2_LIBS= OPENAL_LIBS= \ + OPENGL_LIBS= PNG_LIBS= SDL2_LIBS= X11_LIBS= ZLIB_LIBS= \ + gen/blit.h gen/blitfunc.cpp gen/blitfunc.h gen/blittable.cpp \ + gen/compemu.cpp gen/cpudefs.cpp gen/cpuemu_0.cpp \ + gen/linetoscr.cpp -pre_configure() { - grep -rlw -- -Werror | xargs -n1 -t -I% sed -i % -e "s;-Werror;-Wno-error;" - autoreconf -fi - cd libmpeg2 - autoreconf -fi -} + rm src/readcpu.o gen/cpudefs.o + make $makejobs src/readcpu.o gen/cpudefs.o + touch gen/* + } +fi -post_install() { - vinstall ${FILESDIR}/fs-uae.desktop 644 usr/share/applications +post_extract() { + case "$XBPS_TARGET_MACHINE" in + *-musl) sed -i -e 's/| RTLD_DEEPBIND//' src/dlopen.cpp ;; + esac + sed -i -e '/^NoDisplay/d' share/applications/fs-uae.desktop }
[-- Attachment #1: Type: text/plain, Size: 1234 bytes --] There is an updated pull request by ypsvlq against master on the void-packages repository https://github.com/ypsvlq/void-packages fs-uae https://github.com/void-linux/void-packages/pull/36924 fs-uae: update to 3.1.66. <!-- Uncomment relevant sections and delete options which are not applicable --> #### Testing the changes - I tested the changes in this PR: **YES** <!-- #### New package - This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO** --> <!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration and test at least one native build and, if supported, at least one cross build. Ignore this section if this PR is not skipping CI. --> <!-- #### Local build testing - I built this PR locally for my native architecture, (ARCH-LIBC) - I built this PR locally for these architectures (if supported. mark crossbuilds): - aarch64-musl - armv7l - armv6l-musl --> A patch file from https://github.com/void-linux/void-packages/pull/36924.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-fs-uae-36924.patch --] [-- Type: text/x-diff, Size: 3219 bytes --] From 3253726e32ea98fc7d26c24a7a19eb5cf871aa03 Mon Sep 17 00:00:00 2001 From: Elaine Gibson <ypsvlq@gmail.com> Date: Sat, 30 Apr 2022 18:11:52 +0100 Subject: [PATCH] fs-uae: update to 3.1.66. --- srcpkgs/fs-uae/files/fs-uae.desktop | 11 ------- srcpkgs/fs-uae/template | 46 ++++++++++++++++------------- 2 files changed, 26 insertions(+), 31 deletions(-) delete mode 100644 srcpkgs/fs-uae/files/fs-uae.desktop diff --git a/srcpkgs/fs-uae/files/fs-uae.desktop b/srcpkgs/fs-uae/files/fs-uae.desktop deleted file mode 100644 index 388c561065dc..000000000000 --- a/srcpkgs/fs-uae/files/fs-uae.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Name=FS-UAE -Comment=FS-UAE Amiga Emulator -TryExec=fs-uae -Exec=fs-uae %f -StartupNotify=true -Terminal=false -Type=Application -Icon=fs-uae -Categories=Applications;Emulators;Game - diff --git a/srcpkgs/fs-uae/template b/srcpkgs/fs-uae/template index b4387082e153..71a4a706918a 100644 --- a/srcpkgs/fs-uae/template +++ b/srcpkgs/fs-uae/template @@ -1,36 +1,42 @@ # Template file for 'fs-uae' pkgname=fs-uae -version=3.0.5 +version=3.1.66 revision=1 build_style=gnu-configure -hostmakedepends="automake gettext libtool pkg-config zip" -makedepends="glew-devel libmpeg2-devel SDL2-devel MesaLib-devel - freetype-devel libglib-devel libpng-devel libopenal-devel" -depends="desktop-file-utils hicolor-icon-theme" +hostmakedepends="pkg-config gettext zip" +makedepends="libmpeg2-devel SDL2-devel libglib-devel libpng-devel libopenal-devel" short_desc="FS-UAE Amiga Emulator" maintainer="Orphaned <orphan@voidlinux.org>" license="GPL-2.0-only" homepage="https://fs-uae.net" -distfiles="https://fs-uae.net/stable/${version}/${pkgname}-${version}.tar.gz" -checksum=f26ec42e03cf1a7b53b6ce0d9845aa45bbf472089b5ec046b3eb784ec6859fe3 -nocross="./gen/genlinetoscr: cannot execute binary file: Exec format error" -nopie=yes +distfiles="https://fs-uae.net/files/FS-UAE/Stable/${version}/${pkgname}-${version}.tar.xz" +checksum=606e1868b500413d69bd33bb469f8fd08d6c08988801f17b7dd022f3fbe23832 case "$XBPS_TARGET_MACHINE" in - x86_64*|i686*) ;; + x86_64*|i686*) nopie=yes ;; *) configure_args+=" --disable-jit" ;; esac -CFLAGS="-Wno-error -Wno-narrowing -Wno-alloc-size-larget-than" -CXXFLAGS="${CFLAGS}" +if [ "$CROSS_BUILD" ]; then + post_configure() { + make $makejobs \ + CC=$CC_FOR_BUILD CFLAGS=$CFLAGS_FOR_BULID \ + CXX=$CXX_FOR_BUILD CXXFLAGS=$CXXFLAGS_FOR_BUILD \ + LIBS= GLIB_LIBS= LIBMPEG2_LIBS= OPENAL_LIBS= \ + OPENGL_LIBS= PNG_LIBS= SDL2_LIBS= X11_LIBS= ZLIB_LIBS= \ + gen/blit.h gen/blitfunc.cpp gen/blitfunc.h gen/blittable.cpp \ + gen/compemu.cpp gen/cpudefs.cpp gen/cpuemu_0.cpp \ + gen/linetoscr.cpp -pre_configure() { - grep -rlw -- -Werror | xargs -n1 -t -I% sed -i % -e "s;-Werror;-Wno-error;" - autoreconf -fi - cd libmpeg2 - autoreconf -fi -} + rm src/readcpu.o gen/cpudefs.o + make $makejobs src/readcpu.o gen/cpudefs.o + touch gen/* + } +fi -post_install() { - vinstall ${FILESDIR}/fs-uae.desktop 644 usr/share/applications +post_extract() { + case "$XBPS_TARGET_MACHINE" in + *-musl) sed -i -e 's/| RTLD_DEEPBIND//' src/dlopen.cpp ;; + esac + sed -i -e '/^NoDisplay/d' share/applications/fs-uae.desktop }
[-- Attachment #1: Type: text/plain, Size: 1234 bytes --] There is an updated pull request by ypsvlq against master on the void-packages repository https://github.com/ypsvlq/void-packages fs-uae https://github.com/void-linux/void-packages/pull/36924 fs-uae: update to 3.1.66. <!-- Uncomment relevant sections and delete options which are not applicable --> #### Testing the changes - I tested the changes in this PR: **YES** <!-- #### New package - This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO** --> <!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration and test at least one native build and, if supported, at least one cross build. Ignore this section if this PR is not skipping CI. --> <!-- #### Local build testing - I built this PR locally for my native architecture, (ARCH-LIBC) - I built this PR locally for these architectures (if supported. mark crossbuilds): - aarch64-musl - armv7l - armv6l-musl --> A patch file from https://github.com/void-linux/void-packages/pull/36924.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-fs-uae-36924.patch --] [-- Type: text/x-diff, Size: 3219 bytes --] From c7939feea19627d69c70f9f5efbb701fb6f7d53d Mon Sep 17 00:00:00 2001 From: Elaine Gibson <ypsvlq@gmail.com> Date: Sat, 30 Apr 2022 18:11:52 +0100 Subject: [PATCH] fs-uae: update to 3.1.66. --- srcpkgs/fs-uae/files/fs-uae.desktop | 11 ------- srcpkgs/fs-uae/template | 46 ++++++++++++++++------------- 2 files changed, 26 insertions(+), 31 deletions(-) delete mode 100644 srcpkgs/fs-uae/files/fs-uae.desktop diff --git a/srcpkgs/fs-uae/files/fs-uae.desktop b/srcpkgs/fs-uae/files/fs-uae.desktop deleted file mode 100644 index 388c561065dc..000000000000 --- a/srcpkgs/fs-uae/files/fs-uae.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Name=FS-UAE -Comment=FS-UAE Amiga Emulator -TryExec=fs-uae -Exec=fs-uae %f -StartupNotify=true -Terminal=false -Type=Application -Icon=fs-uae -Categories=Applications;Emulators;Game - diff --git a/srcpkgs/fs-uae/template b/srcpkgs/fs-uae/template index b4387082e153..c631a1b36270 100644 --- a/srcpkgs/fs-uae/template +++ b/srcpkgs/fs-uae/template @@ -1,36 +1,42 @@ # Template file for 'fs-uae' pkgname=fs-uae -version=3.0.5 +version=3.1.66 revision=1 build_style=gnu-configure -hostmakedepends="automake gettext libtool pkg-config zip" -makedepends="glew-devel libmpeg2-devel SDL2-devel MesaLib-devel - freetype-devel libglib-devel libpng-devel libopenal-devel" -depends="desktop-file-utils hicolor-icon-theme" +hostmakedepends="pkg-config gettext zip" +makedepends="libmpeg2-devel SDL2-devel libglib-devel libpng-devel libopenal-devel" short_desc="FS-UAE Amiga Emulator" maintainer="Orphaned <orphan@voidlinux.org>" license="GPL-2.0-only" homepage="https://fs-uae.net" -distfiles="https://fs-uae.net/stable/${version}/${pkgname}-${version}.tar.gz" -checksum=f26ec42e03cf1a7b53b6ce0d9845aa45bbf472089b5ec046b3eb784ec6859fe3 -nocross="./gen/genlinetoscr: cannot execute binary file: Exec format error" -nopie=yes +distfiles="https://fs-uae.net/files/FS-UAE/Stable/${version}/${pkgname}-${version}.tar.xz" +checksum=606e1868b500413d69bd33bb469f8fd08d6c08988801f17b7dd022f3fbe23832 case "$XBPS_TARGET_MACHINE" in - x86_64*|i686*) ;; + x86_64*|i686*) nopie=yes ;; *) configure_args+=" --disable-jit" ;; esac -CFLAGS="-Wno-error -Wno-narrowing -Wno-alloc-size-larget-than" -CXXFLAGS="${CFLAGS}" +if [ "$CROSS_BUILD" ]; then + post_configure() { + make $makejobs \ + CC=$CC_FOR_BUILD CFLAGS=$CFLAGS_FOR_BUILD \ + CXX=$CXX_FOR_BUILD CXXFLAGS=$CXXFLAGS_FOR_BUILD \ + LIBS= GLIB_LIBS= LIBMPEG2_LIBS= OPENAL_LIBS= \ + OPENGL_LIBS= PNG_LIBS= SDL2_LIBS= X11_LIBS= ZLIB_LIBS= \ + gen/blit.h gen/blitfunc.cpp gen/blitfunc.h gen/blittable.cpp \ + gen/compemu.cpp gen/cpudefs.cpp gen/cpuemu_0.cpp \ + gen/linetoscr.cpp -pre_configure() { - grep -rlw -- -Werror | xargs -n1 -t -I% sed -i % -e "s;-Werror;-Wno-error;" - autoreconf -fi - cd libmpeg2 - autoreconf -fi -} + rm src/readcpu.o gen/cpudefs.o + make $makejobs src/readcpu.o gen/cpudefs.o + touch gen/* + } +fi -post_install() { - vinstall ${FILESDIR}/fs-uae.desktop 644 usr/share/applications +post_extract() { + case "$XBPS_TARGET_MACHINE" in + *-musl) sed -i -e 's/| RTLD_DEEPBIND//' src/dlopen.cpp ;; + esac + sed -i -e '/^NoDisplay/d' share/applications/fs-uae.desktop }
[-- Attachment #1: Type: text/plain, Size: 1234 bytes --] There is an updated pull request by ypsvlq against master on the void-packages repository https://github.com/ypsvlq/void-packages fs-uae https://github.com/void-linux/void-packages/pull/36924 fs-uae: update to 3.1.66. <!-- Uncomment relevant sections and delete options which are not applicable --> #### Testing the changes - I tested the changes in this PR: **YES** <!-- #### New package - This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO** --> <!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration and test at least one native build and, if supported, at least one cross build. Ignore this section if this PR is not skipping CI. --> <!-- #### Local build testing - I built this PR locally for my native architecture, (ARCH-LIBC) - I built this PR locally for these architectures (if supported. mark crossbuilds): - aarch64-musl - armv7l - armv6l-musl --> A patch file from https://github.com/void-linux/void-packages/pull/36924.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-fs-uae-36924.patch --] [-- Type: text/x-diff, Size: 3219 bytes --] From 816628458c4306fd8080ff265a1f65fddea58b09 Mon Sep 17 00:00:00 2001 From: Elaine Gibson <ypsvlq@gmail.com> Date: Sat, 30 Apr 2022 18:11:52 +0100 Subject: [PATCH] fs-uae: update to 3.1.66. --- srcpkgs/fs-uae/files/fs-uae.desktop | 11 ------- srcpkgs/fs-uae/template | 46 ++++++++++++++++------------- 2 files changed, 26 insertions(+), 31 deletions(-) delete mode 100644 srcpkgs/fs-uae/files/fs-uae.desktop diff --git a/srcpkgs/fs-uae/files/fs-uae.desktop b/srcpkgs/fs-uae/files/fs-uae.desktop deleted file mode 100644 index 388c561065dc..000000000000 --- a/srcpkgs/fs-uae/files/fs-uae.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Name=FS-UAE -Comment=FS-UAE Amiga Emulator -TryExec=fs-uae -Exec=fs-uae %f -StartupNotify=true -Terminal=false -Type=Application -Icon=fs-uae -Categories=Applications;Emulators;Game - diff --git a/srcpkgs/fs-uae/template b/srcpkgs/fs-uae/template index b4387082e153..c631a1b36270 100644 --- a/srcpkgs/fs-uae/template +++ b/srcpkgs/fs-uae/template @@ -1,36 +1,42 @@ # Template file for 'fs-uae' pkgname=fs-uae -version=3.0.5 +version=3.1.66 revision=1 build_style=gnu-configure -hostmakedepends="automake gettext libtool pkg-config zip" -makedepends="glew-devel libmpeg2-devel SDL2-devel MesaLib-devel - freetype-devel libglib-devel libpng-devel libopenal-devel" -depends="desktop-file-utils hicolor-icon-theme" +hostmakedepends="pkg-config gettext zip" +makedepends="libmpeg2-devel SDL2-devel libglib-devel libpng-devel libopenal-devel" short_desc="FS-UAE Amiga Emulator" maintainer="Orphaned <orphan@voidlinux.org>" license="GPL-2.0-only" homepage="https://fs-uae.net" -distfiles="https://fs-uae.net/stable/${version}/${pkgname}-${version}.tar.gz" -checksum=f26ec42e03cf1a7b53b6ce0d9845aa45bbf472089b5ec046b3eb784ec6859fe3 -nocross="./gen/genlinetoscr: cannot execute binary file: Exec format error" -nopie=yes +distfiles="https://fs-uae.net/files/FS-UAE/Stable/${version}/${pkgname}-${version}.tar.xz" +checksum=606e1868b500413d69bd33bb469f8fd08d6c08988801f17b7dd022f3fbe23832 case "$XBPS_TARGET_MACHINE" in - x86_64*|i686*) ;; + x86_64*|i686*) nopie=yes ;; *) configure_args+=" --disable-jit" ;; esac -CFLAGS="-Wno-error -Wno-narrowing -Wno-alloc-size-larget-than" -CXXFLAGS="${CFLAGS}" +if [ "$CROSS_BUILD" ]; then + post_configure() { + make $makejobs \ + CC=$CC_FOR_BUILD CFLAGS=$CFLAGS_FOR_BUILD \ + CXX=$CXX_FOR_BUILD CXXFLAGS=$CXXFLAGS_FOR_BUILD \ + LIBS= GLIB_LIBS= LIBMPEG2_LIBS= OPENAL_LIBS= \ + OPENGL_LIBS= PNG_LIBS= SDL2_LIBS= X11_LIBS= ZLIB_LIBS= \ + gen/blit.h gen/blitfunc.cpp gen/blitfunc.h gen/blittable.cpp \ + gen/compemu.cpp gen/cpudefs.cpp gen/cpuemu_0.cpp \ + gen/linetoscr.cpp -pre_configure() { - grep -rlw -- -Werror | xargs -n1 -t -I% sed -i % -e "s;-Werror;-Wno-error;" - autoreconf -fi - cd libmpeg2 - autoreconf -fi -} + rm src/readcpu.o gen/cpudefs.o + make $makejobs src/readcpu.o gen/cpudefs.o + touch gen/* + } +fi -post_install() { - vinstall ${FILESDIR}/fs-uae.desktop 644 usr/share/applications +post_extract() { + case "$XBPS_TARGET_MACHINE" in + *-musl) sed -i -e 's/| RTLD_DEEPBIND//' src/dlopen.cpp ;; + esac + sed -i -e '/^NoDisplay/d' share/applications/fs-uae.desktop }
[-- Attachment #1: Type: text/plain, Size: 1097 bytes --] There's a merged pull request on the void-packages repository fs-uae: update to 3.1.66, remove nocross. https://github.com/void-linux/void-packages/pull/36924 Description: <!-- Uncomment relevant sections and delete options which are not applicable --> #### Testing the changes - I tested the changes in this PR: **YES** <!-- #### New package - This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO** --> <!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration and test at least one native build and, if supported, at least one cross build. Ignore this section if this PR is not skipping CI. --> <!-- #### Local build testing - I built this PR locally for my native architecture, (ARCH-LIBC) - I built this PR locally for these architectures (if supported. mark crossbuilds): - aarch64-musl - armv7l - armv6l-musl -->