[gentoo-commits] repo/proj/guru:dev commit in: games-emulation/dosbox-x/files/, games-emulation/dosbox-x/
commit: c9f76c79420506ebe30372e91e9ffd855bedd3e6
Author: Yuan Liao gmail com>
AuthorDate: Wed Jan 25 22:25:15 2023 +
Commit: Yuan Liao gmail com>
CommitDate: Wed Jan 25 22:25:15 2023 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=c9f76c79
games-emulation/dosbox-x: Drop 2022.08.0-r1, 2022.09.1_pre20221210-r1
Signed-off-by: Yuan Liao gmail.com>
games-emulation/dosbox-x/Manifest | 2 -
.../dosbox-x/dosbox-x-2022.08.0-r1.ebuild | 226 -
.../dosbox-x-2022.09.1_pre20221210-r1.ebuild | 211
.../files/dosbox-x-2022.08.0-fix-lto-odr.patch | 368 -
4 files changed, 807 deletions(-)
diff --git a/games-emulation/dosbox-x/Manifest
b/games-emulation/dosbox-x/Manifest
index 50af68e75..787d6cf30 100644
--- a/games-emulation/dosbox-x/Manifest
+++ b/games-emulation/dosbox-x/Manifest
@@ -1,3 +1 @@
-DIST dosbox-x-2022.09.1_pre20221210.tar.gz 67879960 BLAKE2B
f6a6dc0bea3a56577088ee632b17b74489ede8b9cbcd51328c709a6f9bf301a301dff853acab5cb3786aff4c94a2f180e98bfe828cc2d1255a7f7edad29b9f41
SHA512
b5d996611e28e86f7ad45d09bbdcbaf161faec572f3192f034e5acead8014ba2f7f3c3a12e6fc9a5e49742cc08b3f3c4272568491322e7d400a511ce65dbd042
DIST dosbox-x-v2022.12.26.tar.gz 67886370 BLAKE2B
a748c18bd51833f8532ee76cf30c1bed994458acf56f36be3207c9714678f8e1b4c4fb130aeaa54d5cac39f60484b6aa12a4d59fcd8ce1a7ddbb5d98cede9df7
SHA512
18895a3cd9b46a226490f4eda160b92f80e6a9022d22cc192cbf8ddea93803d72b658e9d88ebc3163b93d214389e74f67193e8aac37bf58f7068a1daf68dd550
-DIST dosbox-x-windows-v2022.08.0.tar.gz 67809452 BLAKE2B
d0d8c6b6b328b363ea939de93e920ce33b260f4f986be50028c4a2e188c292be38c256bed7b0d6e052bf2b74600ece662f05b16943e90fbd44e48e2c6b4bc3cc
SHA512
d11b907ff99e8599b454dc5979055dd85a64215913cb905c66d534930ce31afaab14d04169450eef5cb286c65933159f44be6cecad6adf6c7adad1a249758d7b
diff --git a/games-emulation/dosbox-x/dosbox-x-2022.08.0-r1.ebuild
b/games-emulation/dosbox-x/dosbox-x-2022.08.0-r1.ebuild
deleted file mode 100644
index 5956244b0..0
--- a/games-emulation/dosbox-x/dosbox-x-2022.08.0-r1.ebuild
+++ /dev/null
@@ -1,226 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools toolchain-funcs xdg
-
-if [[ "${PV}" == ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/joncampbell123/dosbox-x.git;
-else
-
SRC_URI="https://github.com/joncampbell123/dosbox-x/archive/dosbox-x-windows-v${PV}.tar.gz;
- S="${WORKDIR}/${PN}-${PN}-windows-v${PV}"
- KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Complete, accurate DOS emulator forked from DOSBox"
-HOMEPAGE="https://dosbox-x.com/;
-
-# Stay consistent with games-emulation/dosbox::gentoo even though source file
-# headers specify the GPL version to be "either version 2 of the License, or
-# (at your option) any later version." The same header is used in both the
-# DOSBox source tree and the DOSBox-X source tree.
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="X debug ffmpeg fluidsynth freetype opengl png slirp"
-# Unit tests are only available in debug builds
-RESTRICT="!debug? ( test )"
-
-BDEPEND="
- dev-lang/nasm
- sys-libs/libcap
-"
-
-# Unconditionally pulling in automagically-enabled optional dependencies:
-# - media-libs/alsa-lib
-# - media-libs/sdl2-net
-# - net-libs/libpcap
-#
-# With media-libs/libsdl2[-X,wayland], this package does work on a Wayland
-# desktop, but (at least on GNOME) the program does not launch in a movable
-# and resizable window; whereas with media-libs/libsdl2[X], it does. Thus,
-# unconditionally require media-libs/libsdl2[X] for better user experience.
-RDEPEND="
- media-libs/alsa-lib
- media-libs/libsdl2[X,opengl?,sound,threads,video]
- media-libs/sdl2-net
- net-libs/libpcap
- sys-libs/zlib
- X? (
- x11-libs/libX11
- x11-libs/libXrandr
- x11-libs/libxkbfile
- )
- debug? ( sys-libs/ncurses:= )
- ffmpeg? ( media-video/ffmpeg:= )
- fluidsynth? ( media-sound/fluidsynth:= )
- freetype? ( media-libs/freetype )
- opengl? ( media-libs/libglvnd[X] )
- png? ( media-libs/libpng:= )
- slirp? ( net-libs/libslirp )
-"
-
-DEPEND="
- ${RDEPEND}
-"
-
-PATCHES=(
- # https://bugs.gentoo.org/859973
- # https://github.com/joncampbell123/dosbox-x/issues/3663
- # https://github.com/joncampbell123/dosbox-x/pull/3710
- "${FILESDIR}/${P}-fix-lto-odr.patch"
-)
-
-pkg_pretend() {
- if use ffmpeg && use !png; then
- ewarn "Setting the 'ffmpeg' USE flag when the 'png' USE flag is"
- ewarn "unset does not have any effect. Unsetting the 'png' USE"
- ewarn "flag disables the video capture feature, so additional"
- ewarn "video capture formats enabled by the 'ffmpeg' USE flag"
- ewarn "will end up being unused."
-
[gentoo-commits] repo/proj/guru:dev commit in: games-emulation/dosbox-x/files/, games-emulation/dosbox-x/
commit: e52a88b468775df39735b75167f2ae78cf268b8b
Author: Yuan Liao gmail com>
AuthorDate: Thu Dec 22 00:33:21 2022 +
Commit: Yuan Liao gmail com>
CommitDate: Thu Dec 22 00:40:21 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=e52a88b4
games-emulation/dosbox-x: Backport upstream LTO ODR fix to 2022.08.0
Not bumping revision for this change because the ebuild for 2022.08.0
has just been revision-bumped in the previous commit.
Bug: https://bugs.gentoo.org/859973
Signed-off-by: Yuan Liao gmail.com>
.../dosbox-x/dosbox-x-2022.08.0-r1.ebuild | 14 +-
.../files/dosbox-x-2022.08.0-fix-lto-odr.patch | 368 +
2 files changed, 376 insertions(+), 6 deletions(-)
diff --git a/games-emulation/dosbox-x/dosbox-x-2022.08.0-r1.ebuild
b/games-emulation/dosbox-x/dosbox-x-2022.08.0-r1.ebuild
index bec3c9a2e..d208c6afb 100644
--- a/games-emulation/dosbox-x/dosbox-x-2022.08.0-r1.ebuild
+++ b/games-emulation/dosbox-x/dosbox-x-2022.08.0-r1.ebuild
@@ -5,7 +5,7 @@
EAPI=8
-inherit autotools flag-o-matic toolchain-funcs xdg
+inherit autotools toolchain-funcs xdg
if [[ "${PV}" == ]]; then
inherit git-r3
@@ -68,6 +68,13 @@ DEPEND="
${RDEPEND}
"
+PATCHES=(
+ # https://bugs.gentoo.org/859973
+ # https://github.com/joncampbell123/dosbox-x/issues/3663
+ # https://github.com/joncampbell123/dosbox-x/pull/3710
+ "${FILESDIR}/${P}-fix-lto-odr.patch"
+)
+
pkg_pretend() {
if use ffmpeg && use !png; then
ewarn "Setting the 'ffmpeg' USE flag when the 'png' USE flag is"
@@ -111,11 +118,6 @@ src_prepare() {
die "Failed to remove check for setcap in Makefile.am"
eautoreconf
-
- # https://bugs.gentoo.org/859973
- # https://github.com/joncampbell123/dosbox-x/issues/3663
- # No upstream response regarding LTO yet; disable it for now
- filter-lto
}
src_configure() {
diff --git
a/games-emulation/dosbox-x/files/dosbox-x-2022.08.0-fix-lto-odr.patch
b/games-emulation/dosbox-x/files/dosbox-x-2022.08.0-fix-lto-odr.patch
new file mode 100644
index 0..daf0ae2f2
--- /dev/null
+++ b/games-emulation/dosbox-x/files/dosbox-x-2022.08.0-fix-lto-odr.patch
@@ -0,0 +1,368 @@
+From 7573870bb856ade326033824d7a2ba6fb4fcdfaf Mon Sep 17 00:00:00 2001
+From: Jookia
+Date: Wed, 7 Sep 2022 10:44:48 +1000
+Subject: [PATCH 1/2] libs: Namespace PhysFS lzmasdk
+
+---
+ src/libs/physfs/physfs_archiver_7z.c | 1 +
+ src/libs/physfs/physfs_lzmasdk.h | 6 +-
+ 2 files changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/src/libs/physfs/physfs_archiver_7z.c
b/src/libs/physfs/physfs_archiver_7z.c
+index 604fd13981a..4095f031710 100644
+--- a/src/libs/physfs/physfs_archiver_7z.c
b/src/libs/physfs/physfs_archiver_7z.c
+@@ -12,6 +12,7 @@
+ #if PHYSFS_SUPPORTS_7Z
+
+ #include "physfs_lzmasdk.h"
++using namespace physfs_lzmasdk;
+
+ typedef struct
+ {
+diff --git a/src/libs/physfs/physfs_lzmasdk.h
b/src/libs/physfs/physfs_lzmasdk.h
+index 239f8f0d1a2..f0abaa136a8 100644
+--- a/src/libs/physfs/physfs_lzmasdk.h
b/src/libs/physfs/physfs_lzmasdk.h
+@@ -7,13 +7,15 @@ Igor Pavlov. http://www.7-zip.org/sdk.html
+ --ryan. */
+
+
+-
+ /* 7zTypes.h -- Basic types
+ 2013-11-12 : Igor Pavlov : Public domain */
+
+ #ifndef __7Z_TYPES_H
+ #define __7Z_TYPES_H
+
++// Jookia: Added to avoid conflict with other LZMA libraries
++namespace physfs_lzmasdk {
++
+ #ifdef _WIN32
+ /* #include */
+ #endif
+@@ -6030,6 +6032,8 @@ static SRes Lzma2Dec_DecodeToDic(CLzma2Dec *p, SizeT
dicLimit,
+ return SZ_OK;
+ }
+
++}
++
+ #endif /* _INCLUDE_PHYSFS_LZMASDK_H_ */
+
+ /* end of physfs_lzmasdk.h ... */
+
+From 7fb29da0ec0aff0c35c3dce2e8da14205103d5b5 Mon Sep 17 00:00:00 2001
+From: Jookia
+Date: Wed, 7 Sep 2022 10:56:40 +1000
+Subject: [PATCH 2/2] cpu: Rename data types that conflict under ODR
+
+---
+ src/cpu/core_dyn_x86.cpp| 4 ++--
+ src/cpu/core_dyn_x86/cache.h| 2 +-
+ src/cpu/core_dyn_x86/decoder.h | 10 +-
+ src/cpu/core_dyn_x86/risc_x64.h | 12 ++--
+ src/cpu/core_dyn_x86/risc_x86.h | 8
+ src/cpu/core_dyn_x86/string.h | 4 ++--
+ src/cpu/core_dynrec.cpp | 10 +-
+ src/cpu/core_dynrec/cache.h | 2 +-
+ src/cpu/core_dynrec/decoder_basic.h | 10 +-
+ src/cpu/core_normal/string.h| 4 ++--
+ 10 files changed, 33 insertions(+), 33 deletions(-)
+
+diff --git a/src/cpu/core_dyn_x86.cpp b/src/cpu/core_dyn_x86.cpp
+index 27c3dab5a6c..63beea5d495 100644
+--- a/src/cpu/core_dyn_x86.cpp
b/src/cpu/core_dyn_x86.cpp
+@@ -98,7 +98,7 @@ enum BranchTypes {
+ };
+
+
+-enum BlockReturn {
++enum BlockReturnDynX86 {
+ BR_Normal=0,
+ BR_Cycles,
+ BR_Link1,BR_Link2,
+@@ -363,7 +363,7 @@ Bits CPU_Core_Dyn_X86_Run(void) {
+ run_block:
+ cache.block.running=0;
+ core_dyn.pagefault = false;
+- BlockReturn
[gentoo-commits] repo/proj/guru:dev commit in: games-emulation/dosbox-x/files/, games-emulation/dosbox-x/
commit: 9c3e7435ab41e0ad1e99108bda28f1c32a8cb89f
Author: Yuan Liao gmail com>
AuthorDate: Thu Oct 6 14:29:53 2022 +
Commit: Yuan Liao gmail com>
CommitDate: Thu Oct 6 14:29:53 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=9c3e7435
games-emulation/dosbox-x: Drop 0.84.1
Signed-off-by: Yuan Liao gmail.com>
games-emulation/dosbox-x/Manifest | 1 -
games-emulation/dosbox-x/dosbox-x-0.84.1.ebuild| 215 -
...x-0.84.1-fix-build-error-with-disable-x11.patch | 43 -
3 files changed, 259 deletions(-)
diff --git a/games-emulation/dosbox-x/Manifest
b/games-emulation/dosbox-x/Manifest
index 8727cde70..150dfe080 100644
--- a/games-emulation/dosbox-x/Manifest
+++ b/games-emulation/dosbox-x/Manifest
@@ -1,2 +1 @@
-DIST dosbox-x-v0.84.1.tar.gz 67617800 BLAKE2B
b7a93ac662d987f99884078fa8a2b566c8aef691861cd8b8270698470cef70e352616970e46439664eedb37b11f673a3cf7d253e45ed756e28740dd06080fffc
SHA512
2104352f5756fa394c6a38f6b82694e4b17878b87d64cb67aeeb8ef9f9cf12cadfc8cd23b4626bbb59b8f0657ae6747633ac80016df511b7d9612245b32d21ca
DIST dosbox-x-windows-v2022.08.0.tar.gz 67809452 BLAKE2B
d0d8c6b6b328b363ea939de93e920ce33b260f4f986be50028c4a2e188c292be38c256bed7b0d6e052bf2b74600ece662f05b16943e90fbd44e48e2c6b4bc3cc
SHA512
d11b907ff99e8599b454dc5979055dd85a64215913cb905c66d534930ce31afaab14d04169450eef5cb286c65933159f44be6cecad6adf6c7adad1a249758d7b
diff --git a/games-emulation/dosbox-x/dosbox-x-0.84.1.ebuild
b/games-emulation/dosbox-x/dosbox-x-0.84.1.ebuild
deleted file mode 100644
index 55c5d316c..0
--- a/games-emulation/dosbox-x/dosbox-x-0.84.1.ebuild
+++ /dev/null
@@ -1,215 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools flag-o-matic toolchain-funcs xdg
-
-if [[ "${PV}" == ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/joncampbell123/dosbox-x.git;
-else
-
SRC_URI="https://github.com/joncampbell123/dosbox-x/archive/dosbox-x-v${PV}.tar.gz;
- S="${WORKDIR}/${PN}-${PN}-v${PV}"
- KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Complete, accurate DOS emulator forked from DOSBox"
-HOMEPAGE="https://dosbox-x.com/;
-
-# Stay consistent with games-emulation/dosbox::gentoo even though source file
-# headers specify the GPL version to be "either version 2 of the License, or
-# (at your option) any later version." The same header is used in both the
-# DOSBox source tree and the DOSBox-X source tree.
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="X debug ffmpeg fluidsynth freetype opengl png slirp"
-
-BDEPEND="
- dev-lang/nasm
- sys-libs/libcap
-"
-
-# Unconditionally pulling in automagically-enabled optional dependencies:
-# - media-libs/alsa-lib
-# - media-libs/sdl2-net
-# - net-libs/libpcap
-#
-# With media-libs/libsdl2[-X,wayland], this package does work on a Wayland
-# desktop, but (at least on GNOME) the program does not launch in a movable
-# and resizable window; whereas with media-libs/libsdl2[X], it does. Thus,
-# unconditionally require media-libs/libsdl2[X] for better user experience.
-RDEPEND="
- media-libs/alsa-lib
- media-libs/libsdl2[X,opengl?,sound,threads,video]
- media-libs/sdl2-net
- net-libs/libpcap
- sys-libs/zlib
- X? (
- x11-libs/libX11
- x11-libs/libXrandr
- x11-libs/libxkbfile
- )
- debug? ( sys-libs/ncurses:= )
- ffmpeg? ( media-video/ffmpeg:= )
- fluidsynth? ( media-sound/fluidsynth:= )
- freetype? ( media-libs/freetype )
- opengl? ( media-libs/libglvnd[X] )
- png? ( media-libs/libpng:= )
- slirp? ( net-libs/libslirp )
-"
-
-DEPEND="
- ${RDEPEND}
-"
-
-PATCHES=(
- # Only needed on 0.84.1; please remove for newer releases
- "${FILESDIR}/${P}-fix-build-error-with-disable-x11.patch"
-)
-
-pkg_pretend() {
- if use ffmpeg && use !png; then
- ewarn "Setting the 'ffmpeg' USE flag when the 'png' USE flag is"
- ewarn "unset does not have any effect. Unsetting the 'png' USE"
- ewarn "flag disables the video capture feature, so additional"
- ewarn "video capture formats enabled by the 'ffmpeg' USE flag"
- ewarn "will end up being unused."
- fi
-}
-
-src_prepare() {
- default
-
- # Patch command lines like the following in Makefile.am:
- # -test -x /usr/sbin/setcap && setcap cap_net_raw=ep
$(DESTDIR)$(bindir)/dosbox-x
- #
- # The purpose of these commands is, if the 'setcap' program exists and
is
- # executable, then invoke it to set capabilities required by the PCAP
- # networking back-end for better out-of-box user experience; otherwise,
- # ignore unsatisfied preconditions or 'setcap' errors since they are not
- # critical, which is achieved by having a '-' in front of each line.
- #
