Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 644176 - =games-emulation/dosbox-9999 with USE="glide" fails to apply glide patch
Summary: =games-emulation/dosbox-9999 with USE="glide" fails to apply glide patch
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: All Linux
: Normal normal (vote)
Assignee: Gentoo Games
URL:
Whiteboard:
Keywords: PATCH
Depends on:
Blocks:
 
Reported: 2018-01-11 03:00 UTC by Sophie Hamilton
Modified: 2018-01-18 10:14 UTC (History)
1 user (show)

See Also:
Package list:
Runtime testing required: ---


Attachments
dosbox-9999.ebuild (dosbox-9999.ebuild,1.84 KB, text/plain)
2018-01-11 21:55 UTC, Sophie Hamilton
Details

Note You need to log in before you can comment on or make changes to this bug.
Description Sophie Hamilton 2018-01-11 03:00:06 UTC
The Glide patch introduced in bug #593686 no longer applies due to a change in DOSBox's "configure.ac" file in r4056: https://sourceforge.net/p/dosbox/code-0/4056/ .

I've reported this upstream at https://github.com/voyageur/openglide/issues/9 (the project which the ebuild takes the patch from) and https://www.vogons.org/viewtopic.php?p=640763#p640763 (the forum thread where the Glide patch was given), but I also wanted to make it known here that this is an issue.

The hunk that gets rejected seems to only be for Cygwin/mingw32; everything else still gets applied, so it's possible that one solution might be just to remove that particular hunk in the ebuild. I haven't yet tested this, however.
Comment 1 Sophie Hamilton 2018-01-11 21:55:11 UTC
Created attachment 514428 [details]
dosbox-9999.ebuild

Upstream at OpenGlide has committed a new version of the patch; I'm attaching an ebuild that updates the GLIDE_PATCH commit ID. This emerges fine on my system; emerge --info below.

=====

Portage 2.3.13 (python 2.7.14-final-0, default/linux/amd64/17.0, gcc-6.4.0, glibc-2.25-r9, 4.14.12-gentoo x86_64)
=================================================================
                         System Settings
=================================================================
System uname: Linux-4.14.12-gentoo-x86_64-Intel-R-_Core-TM-_i7-5820K_CPU_@_3.30GHz-with-gentoo-2.4.1
KiB Mem:    32917680 total,  20118392 free
KiB Swap:    8191996 total,   8191996 free
Timestamp of repository gentoo: Thu, 11 Jan 2018 03:30:01 +0000
Head commit of repository gentoo: 89d6a4c6106c486fcce7b156f37c6bf5d7917761
sh bash 4.4_p12
ld GNU ld (Gentoo 2.29.1 p3) 2.29.1
app-shells/bash:          4.4_p12::gentoo
dev-java/java-config:     2.2.0-r3::gentoo
dev-lang/perl:            5.24.3::gentoo
dev-lang/python:          2.7.14-r1::gentoo, 3.4.5-r1::gentoo, 3.5.4-r1::gentoo
dev-util/cmake:           3.9.6::gentoo
dev-util/pkgconfig:       0.29.2::gentoo
sys-apps/baselayout:      2.4.1-r2::gentoo
sys-apps/openrc:          0.34.11::gentoo
sys-apps/sandbox:         2.10-r4::gentoo
sys-devel/autoconf:       2.13::gentoo, 2.69-r4::gentoo
sys-devel/automake:       1.11.6-r2::gentoo, 1.15.1-r1::gentoo
sys-devel/binutils:       2.29.1-r1::gentoo
sys-devel/gcc:            6.4.0::gentoo
sys-devel/gcc-config:     1.8-r1::gentoo
sys-devel/libtool:        2.4.6-r3::gentoo
sys-devel/make:           4.2.1::gentoo
sys-kernel/linux-headers: 4.13::gentoo (virtual/os-headers)
sys-libs/glibc:           2.25-r9::gentoo
Repositories:

gentoo
    location: /usr/portage
    sync-type: rsync
    sync-uri: rsync://rsync.gentoo.org/gentoo-portage
    priority: -1000
    sync-rsync-extra-opts: 

sph-local
    location: /opt/portage-overlay
    masters: gentoo
    priority: 0

abendbrot
    location: /var/lib/layman/abendbrot
    masters: gentoo
    priority: 50

gambas-overlay
    location: /var/lib/layman/gambas-overlay
    masters: gentoo
    priority: 50

lmiphay
    location: /var/lib/layman/lmiphay
    masters: gentoo
    priority: 50

netfab
    location: /var/lib/layman/netfab
    masters: gentoo
    priority: 50

palemoon
    location: /var/lib/layman/palemoon
    masters: gentoo
    priority: 50

x11
    location: /var/lib/layman/x11
    masters: gentoo
    priority: 50

ACCEPT_KEYWORDS="amd64"
ACCEPT_LICENSE="* -@EULA"
CBUILD="x86_64-pc-linux-gnu"
CFLAGS="-march=native -O2 -pipe"
CHOST="x86_64-pc-linux-gnu"
CONFIG_PROTECT="/etc /usr/lib64/avfs/extfs /usr/share/gnupg/qualified.txt"
CONFIG_PROTECT_MASK="/etc/ca-certificates.conf /etc/dconf /etc/env.d /etc/fonts/fonts.conf /etc/gconf /etc/gentoo-release /etc/revdep-rebuild /etc/sandbox.d /etc/terminfo /etc/texmf/language.dat.d /etc/texmf/language.def.d /etc/texmf/updmap.d /etc/texmf/web2c"
CXXFLAGS="-march=native -O2 -pipe"
DISTDIR="/usr/portage/distfiles"
EMERGE_DEFAULT_OPTS="--ask-enter-invalid --autounmask-keep-masks y"
FCFLAGS="-O2 -pipe"
FEATURES="assume-digests binpkg-logs distlocks ebuild-locks fixlafiles merge-sync multilib-strict news parallel-fetch preserve-libs protect-owned sandbox sfperms strict unknown-features-warn unmerge-logs unmerge-orphans userfetch userpriv usersandbox usersync xattr"
FFLAGS="-O2 -pipe"
GENTOO_MIRRORS="https://ftp-stud.hs-esslingen.de/pub/Mirrors/gentoo/"
LANG="en_GB.utf8"
LDFLAGS="-Wl,-O1 -Wl,--as-needed"
LINGUAS="en en-GB"
MAKEOPTS="-j13"
PKGDIR="/usr/portage/packages"
PORTAGE_CONFIGROOT="/"
PORTAGE_RSYNC_OPTS="--recursive --links --safe-links --perms --times --omit-dir-times --compress --force --whole-file --delete --stats --human-readable --timeout=180 --exclude=/distfiles --exclude=/local --exclude=/packages --exclude=/.git"
PORTAGE_TMPDIR="/var/tmp"
USE="X a52 aac aacplus acl acpi alsa amd64 amr berkdb bluray bzip2 cairo cdda cddb cdio cdparanoia cli crypt cups cxx dbus dri dts dvd flac fluidsynth fontconfig fortran gdbm gpm gtk iconv ipv6 jpeg libnotify lzma mad mmx modplug modules mp3 mtp multilib ncurses nls nptl ogg opencl opengl openmp pam pcre png qt3support qt5 readline seccomp sound sse sse2 ssl startup-notification svg tcl tcpd theora tk truetype unicode v4l vdpau vim-syntax vorbis xattr xv xvmc zlib" ABI_X86="64" ALSA_CARDS="ali5451 als4000 atiixp atiixp-modem bt87x ca0106 cmipci emu10k1x ens1370 ens1371 es1938 es1968 fm801 hda-intel intel8x0 intel8x0m maestro3 trident usb-audio via82xx via82xx-modem ymfpci" APACHE2_MODULES="authn_core authz_core socache_shmcb unixd actions alias auth_basic authn_alias authn_anon authn_dbm authn_default authn_file authz_dbm authz_default authz_groupfile authz_host authz_owner authz_user autoindex cache cgi cgid dav dav_fs dav_lock deflate dir disk_cache env expires ext_filter file_cache filter headers include info log_config logio mem_cache mime mime_magic negotiation rewrite setenvif speling status unique_id userdir usertrack vhost_alias" CALLIGRA_FEATURES="kexi words flow plan sheets stage tables krita karbon braindump author" COLLECTD_PLUGINS="df interface irq load memory rrdtool swap syslog" CPU_FLAGS_X86="aes avx avx2 fma3 mmx mmxext popcnt sse sse2 sse3 sse4_1 sse4_2 ssse3" ELIBC="glibc" GPSD_PROTOCOLS="ashtech aivdm earthmate evermore fv18 garmin garmintxt gpsclock isync itrax mtk3301 nmea ntrip navcom oceanserver oldstyle oncore rtcm104v2 rtcm104v3 sirf skytraq superstar2 timing tsip tripmate tnt ublox ubx" INPUT_DEVICES="libinput keyboard mouse" KERNEL="linux" L10N="en en-GB" LCD_DEVICES="bayrad cfontz cfontz633 glk hd44780 lb216 lcdm001 mtxorb ncurses text" LIBREOFFICE_EXTENSIONS="presenter-console presenter-minimizer" OFFICE_IMPLEMENTATION="libreoffice" PHP_TARGETS="php5-6 php7-0" POSTGRES_TARGETS="postgres9_5" PYTHON_SINGLE_TARGET="python3_5" PYTHON_TARGETS="python2_7 python3_5" QEMU_SOFTMMU_TARGETS="x86_64 arm i386 mips mipsel ppc sparc" QEMU_USER_TARGETS="aarch64 alpha arm i386 m68k mips mipsel ppc sparc x86_64" RUBY_TARGETS="ruby22" USERLAND="GNU" VIDEO_CARDS="nouveau" XTABLES_ADDONS="quota2 psd pknock lscan length2 ipv4options ipset ipp2p iface geoip fuzzy condition tee tarpit sysrq steal rawnat logmark ipmark dhcpmac delude chaos account"
Unset:  CC, CPPFLAGS, CTARGET, CXX, INSTALL_MASK, LC_ALL, PORTAGE_BUNZIP2_COMMAND, PORTAGE_COMPRESS, PORTAGE_COMPRESS_FLAGS, PORTAGE_RSYNC_EXTRA_OPTS

=================================================================
                        Package Settings
=================================================================

games-emulation/dosbox-9999::sph-local was built with the following:
USE="alsa glide opengl -debug -hardened" ABI_X86="(64)"
Comment 2 Sophie Hamilton 2018-01-14 02:58:43 UTC
I should note for the record, btw, that this GLIDE_PATCH change is only for the live SVN ebuild. For 0.74, the original patch still applies.
Comment 3 James Le Cuirot gentoo-dev 2018-01-14 09:54:04 UTC
Thanks. I will take care of this, just need to get something else sorted first.
Comment 4 Sophie Hamilton 2018-01-17 03:52:01 UTC
It looks like when the Gentoo maintainer in charge of upstream fixed it by updating their patch, they committed the correct ebuild change to Gentoo's git at the same time:

https://github.com/gentoo/gentoo/commit/7e320bc722fd130f33b000a4c8f963ebf584447b

As such, this bug's fixed, so I'll close it out now. Thank you to both of you for dealing with this bug!
Comment 5 James Le Cuirot gentoo-dev 2018-01-17 09:55:01 UTC
(In reply to Sophie Hamilton from comment #4)
> It looks like when the Gentoo maintainer in charge of upstream fixed it by
> updating their patch, they committed the correct ebuild change to Gentoo's
> git at the same time.

Funny, I somehow never noticed that voyageur is actually a Gentoo dev. :)
Comment 6 Bernard Cafarelli gentoo-dev 2018-01-18 10:14:42 UTC
(In reply to James Le Cuirot from comment #5)
> Funny, I somehow never noticed that voyageur is actually a Gentoo dev. :)

I'm hurt :)