* [gentoo-commits] repo/gentoo:master commit in: media-libs/allegro/, media-libs/allegro/files/
@ 2016-02-29 6:43 Michael Sterrett
0 siblings, 0 replies; 8+ messages in thread
From: Michael Sterrett @ 2016-02-29 6:43 UTC (permalink / raw
To: gentoo-commits
commit: 54637c717de2ee1a029ec718c5b53e6e0719ebab
Author: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 29 06:33:22 2016 +0000
Commit: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
CommitDate: Mon Feb 29 06:43:06 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54637c71
media-libs/allegro: fix building with multilib with patch from Azamat H. Hackimov (bug #563152)
Package-Manager: portage-2.2.26
media-libs/allegro/allegro-5.0.11.ebuild | 4 ++--
media-libs/allegro/files/allegro-5.0.11-multilib.patch | 10 ++++++++++
...ro-5.0.4-underlink.patch => allegro-5.0.11-underlink.patch} | 0
3 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/media-libs/allegro/allegro-5.0.11.ebuild b/media-libs/allegro/allegro-5.0.11.ebuild
index 6d0496d..2ee1cc6 100644
--- a/media-libs/allegro/allegro-5.0.11.ebuild
+++ b/media-libs/allegro/allegro-5.0.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -39,7 +39,7 @@ DEPEND="${RDEPEND}
>=x11-proto/xf86vidmodeproto-2.3.1-r1[${MULTILIB_USEDEP}]
>=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]"
-PATCHES=( "${FILESDIR}"/${PN}-5.0.4-underlink.patch )
+PATCHES=( "${FILESDIR}"/${P}-{underlink,multilib}.patch )
MULTILIB_WRAPPED_HEADERS=( /usr/include/allegro5/allegro_native_dialog.h )
diff --git a/media-libs/allegro/files/allegro-5.0.11-multilib.patch b/media-libs/allegro/files/allegro-5.0.11-multilib.patch
new file mode 100644
index 0000000..ffb0c25
--- /dev/null
+++ b/media-libs/allegro/files/allegro-5.0.11-multilib.patch
@@ -0,0 +1,10 @@
+--- CMakeLists.txt.old 2013-06-16 10:16:08.000000000 +0600
++++ CMakeLists.txt 2016-02-25 14:32:40.350446191 +0500
+@@ -560,7 +560,6 @@
+ endif(SUPPORT_X11 AND NOT SUPPORT_OPENGL)
+
+ if(SUPPORT_X11)
+- set(CMAKE_REQUIRED_LIBRARIES ${X11_LIBRARIES})
+
+ check_library_exists(Xcursor XcursorImageCreate "" CAN_XCURSOR)
+ if(CAN_XCURSOR)
diff --git a/media-libs/allegro/files/allegro-5.0.4-underlink.patch b/media-libs/allegro/files/allegro-5.0.11-underlink.patch
similarity index 100%
rename from media-libs/allegro/files/allegro-5.0.4-underlink.patch
rename to media-libs/allegro/files/allegro-5.0.11-underlink.patch
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/allegro/, media-libs/allegro/files/
@ 2018-07-16 22:26 Andreas Sturmlechner
0 siblings, 0 replies; 8+ messages in thread
From: Andreas Sturmlechner @ 2018-07-16 22:26 UTC (permalink / raw
To: gentoo-commits
commit: 694d50ca20849b80a17c9f4445398fb03342fe90
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 16 18:20:20 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jul 16 22:25:55 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=694d50ca
media-libs/allegro: 5.0.11 EAPI-6 bump
Package-Manager: Portage-2.3.43, Repoman-2.3.10
media-libs/allegro/allegro-5.0.11.ebuild | 59 ++++++++++++----------
.../allegro/files/allegro-5.0.11-multilib.patch | 4 +-
.../allegro/files/allegro-5.0.11-underlink.patch | 4 +-
3 files changed, 35 insertions(+), 32 deletions(-)
diff --git a/media-libs/allegro/allegro-5.0.11.ebuild b/media-libs/allegro/allegro-5.0.11.ebuild
index f54c046fec5..26b2dff5064 100644
--- a/media-libs/allegro/allegro-5.0.11.ebuild
+++ b/media-libs/allegro/allegro-5.0.11.ebuild
@@ -1,7 +1,8 @@
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
+
inherit cmake-multilib
DESCRIPTION="A game programming library"
@@ -13,9 +14,17 @@ SLOT="5"
KEYWORDS="amd64 ppc ppc64 x86"
IUSE="alsa dumb flac gtk jpeg openal oss physfs png pulseaudio test truetype vorbis X xinerama"
-RDEPEND="alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+RDEPEND="
+ >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXcursor-1.1.14[${MULTILIB_USEDEP}]
+ >=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}]
+ >=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
+ >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
+ alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
dumb? ( >=media-libs/dumb-0.9.3-r2[${MULTILIB_USEDEP}] )
flac? ( >=media-libs/flac-1.2.1-r5[${MULTILIB_USEDEP}] )
+ gtk? ( >=x11-libs/gtk+-2.24.23:2[${MULTILIB_USEDEP}] )
jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] )
physfs? ( >=dev-games/physfs-2.0.3-r1[${MULTILIB_USEDEP}] )
@@ -23,18 +32,12 @@ RDEPEND="alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
truetype? ( >=media-libs/freetype-2.5.0.1[${MULTILIB_USEDEP}] )
vorbis? ( >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}] )
- >=x11-libs/libXcursor-1.1.14[${MULTILIB_USEDEP}]
- >=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}]
- >=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}]
- >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
- gtk? ( >=x11-libs/gtk+-2.24.23:2[${MULTILIB_USEDEP}] )
- >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
- >=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
- xinerama? ( >=x11-libs/libXinerama-1.1.3[${MULTILIB_USEDEP}] )"
-
+ xinerama? ( >=x11-libs/libXinerama-1.1.3[${MULTILIB_USEDEP}] )
+"
DEPEND="${RDEPEND}
>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
- x11-base/xorg-proto"
+ x11-base/xorg-proto
+"
PATCHES=( "${FILESDIR}"/${P}-{underlink,multilib}.patch )
@@ -42,32 +45,32 @@ MULTILIB_WRAPPED_HEADERS=( /usr/include/allegro5/allegro_native_dialog.h )
src_configure() {
local mycmakeargs=(
- $(cmake-utils_use_want alsa)
+ -DWANT_ALSA=$(usex alsa)
-DWANT_DEMO=OFF
-DWANT_EXAMPLES=OFF
- $(cmake-utils_use_want flac)
- $(cmake-utils_use_want jpeg IMAGE_JPG)
- $(cmake-utils_use_want png IMAGE_PNG)
- $(cmake-utils_use_want dumb MODAUDIO)
- $(cmake-utils_use_want openal)
- $(cmake-utils_use_want oss)
- $(cmake-utils_use_want physfs)
- $(cmake-utils_use_want pulseaudio)
- $(cmake-utils_use_want test TESTS)
- $(cmake-utils_use_want truetype TTF)
- $(cmake-utils_use_want vorbis)
- $(cmake-utils_use_want gtk NATIVE_DIALOG)
- $(cmake-utils_use_want X opengl)
- $(cmake-utils_use_want xinerama X11_XINERAMA)
+ -DWANT_FLAC=$(usex flac)
+ -DWANT_IMAGE_JPG=$(usex jpeg)
+ -DWANT_IMAGE_PNG=$(usex png)
+ -DWANT_MODAUDIO=$(usex dumb)
+ -DWANT_OPENAL=$(usex openal)
+ -DWANT_OSS=$(usex oss)
+ -DWANT_PHYSFS=$(usex physfs)
+ -DWANT_PULSEAUDIO=$(usex pulseaudio)
+ -DWANT_TESTS=$(usex test)
+ -DWANT_TTF=$(usex truetype)
+ -DWANT_VORBIS=$(usex vorbis)
+ -DWANT_NATIVE_DIALOG=$(usex gtk)
+ -DWANT_OPENGL=$(usex X)
+ -DWANT_X11_XINERAMA=$(usex xinerama)
)
cmake-multilib_src_configure
}
src_install() {
+ local HTML_DOCS=( docs/html/refman/. )
cmake-multilib_src_install
dodoc CHANGES-5.0.txt
- dohtml -r docs/html/refman/*
doman docs/man/*.3
}
diff --git a/media-libs/allegro/files/allegro-5.0.11-multilib.patch b/media-libs/allegro/files/allegro-5.0.11-multilib.patch
index ffb0c25fc8b..8cd1dc1037b 100644
--- a/media-libs/allegro/files/allegro-5.0.11-multilib.patch
+++ b/media-libs/allegro/files/allegro-5.0.11-multilib.patch
@@ -1,5 +1,5 @@
---- CMakeLists.txt.old 2013-06-16 10:16:08.000000000 +0600
-+++ CMakeLists.txt 2016-02-25 14:32:40.350446191 +0500
+--- a/CMakeLists.txt 2013-06-16 10:16:08.000000000 +0600
++++ b/CMakeLists.txt 2016-02-25 14:32:40.350446191 +0500
@@ -560,7 +560,6 @@
endif(SUPPORT_X11 AND NOT SUPPORT_OPENGL)
diff --git a/media-libs/allegro/files/allegro-5.0.11-underlink.patch b/media-libs/allegro/files/allegro-5.0.11-underlink.patch
index 7702c1d2c6d..1e0b502ed3e 100644
--- a/media-libs/allegro/files/allegro-5.0.11-underlink.patch
+++ b/media-libs/allegro/files/allegro-5.0.11-underlink.patch
@@ -1,5 +1,5 @@
---- CMakeLists.txt.old 2011-06-06 23:56:09.367125536 +0200
-+++ CMakeLists.txt 2011-06-06 23:56:19.311748807 +0200
+--- a/CMakeLists.txt 2011-06-06 23:56:09.367125536 +0200
++++ b/CMakeLists.txt 2011-06-06 23:56:19.311748807 +0200
@@ -703,7 +703,7 @@
if(ALLEGRO_UNIX) # not MACOSX
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/allegro/, media-libs/allegro/files/
@ 2019-01-05 21:26 Andreas K. Hüttel
0 siblings, 0 replies; 8+ messages in thread
From: Andreas K. Hüttel @ 2019-01-05 21:26 UTC (permalink / raw
To: gentoo-commits
commit: 3be906b6d1bf00080db368eff9cef997604e4862
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 5 21:26:18 2019 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Jan 5 21:26:18 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3be906b6
media-libs/allegro: Backport glibc-2.28 compatibility fix
Bug: https://bugs.gentoo.org/670781
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
media-libs/allegro/allegro-4.4.2-r2.ebuild | 112 +++++++++++++++++++++
.../allegro/files/allegro-4.4.2-glibc228.patch | 41 ++++++++
2 files changed, 153 insertions(+)
diff --git a/media-libs/allegro/allegro-4.4.2-r2.ebuild b/media-libs/allegro/allegro-4.4.2-r2.ebuild
new file mode 100644
index 00000000000..19cd6bed639
--- /dev/null
+++ b/media-libs/allegro/allegro-4.4.2-r2.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+CMAKE_IN_SOURCE_BUILD=1
+inherit cmake-utils desktop
+
+DESCRIPTION="cross-platform multimedia library"
+HOMEPAGE="https://liballeg.org/"
+SRC_URI="mirror://sourceforge/alleg/${P}.tar.gz"
+
+LICENSE="Allegro MIT GPL-2+ ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~mips ~ppc ~ppc64 ~x86"
+IUSE="alsa fbcon jack jpeg opengl oss png svga test vga vorbis X"
+
+RDEPEND="
+ alsa? ( media-libs/alsa-lib )
+ jack? ( media-sound/jack-audio-connection-kit )
+ jpeg? ( virtual/jpeg:0 )
+ png? ( media-libs/libpng:0= )
+ svga? ( media-libs/svgalib )
+ vorbis? ( media-libs/libvorbis )
+ X? (
+ x11-libs/libX11
+ x11-libs/libXcursor
+ x11-libs/libXext
+ x11-libs/libXpm
+ x11-libs/libXt
+ x11-libs/libXxf86dga
+ x11-libs/libXxf86vm
+ opengl? (
+ virtual/glu
+ virtual/opengl
+ )
+ )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ X? ( x11-base/xorg-proto )"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-shared.patch
+ "${FILESDIR}"/${P}-underlink.patch
+ "${FILESDIR}"/${P}-gentoo.patch
+ "${FILESDIR}"/${P}-rpath.patch
+ "${FILESDIR}"/${P}-Werror-format-security.patch # bug 540470
+ "${FILESDIR}"/${P}-glibc228.patch # bug 670781
+)
+
+src_prepare() {
+ cmake-utils_src_prepare
+
+ sed -i \
+ -e "s:allegro-\${ALLEGRO_VERSION}:${PF}:" \
+ docs/CMakeLists.txt || die
+}
+
+src_configure() {
+ # WANT_LINUX_CONSOLE is by default OFF
+ # WANT_EXAMPLES doesn't install anything
+ local mycmakeargs=(
+ -DDOCDIR=share/doc
+ -DINFODIR=share/info
+ -DMANDIR=share/man
+ -DWANT_ALSA=$(usex alsa)
+ -DWANT_EXAMPLES=OFF
+ -DWANT_JACK=$(usex jack)
+ -DWANT_JPGALLEG=$(usex jpeg)
+ -DWANT_LINUX_CONSOLE=OFF
+ -DWANT_LINUX_FBCON=$(usex fbcon)
+ -DWANT_LINUX_SVGALIB=$(usex svga)
+ -DWANT_LINUX_VGA=$(usex vga)
+ -DWANT_LOADPNG=$(usex png)
+ -DWANT_LOGG=$(usex vorbis)
+ -DWANT_OSS=$(usex oss)
+ -DWANT_TESTS=$(usex test)
+ -DWANT_TOOLS=$(usex X)
+ -DWANT_X11=$(usex X)
+ )
+
+ if use X; then
+ mycmakeargs+=( -DWANT_ALLEGROGL=$(usex opengl) )
+ else
+ mycmakeargs+=( -DWANT_ALLEGROGL=OFF )
+ fi
+
+ cmake-utils_src_configure
+}
+
+src_install() {
+ rm -r docs/html/{build,tmpfile.txt} || die
+ local HTML_DOCS=( docs/html/. )
+
+ cmake-utils_src_install
+
+ #176020 (init_dialog.3), #409305 (key.3)
+ pushd docs/man >/dev/null
+ local manpage
+ for manpage in $(ls -d *.3); do
+ newman ${manpage} ${PN}-${manpage}
+ done
+ popd >/dev/null
+
+ if use X; then
+ newbin setup/setup ${PN}-setup
+ insinto /usr/share/${PN}
+ doins {keyboard,language,setup/setup}.dat
+ newicon misc/icon.png ${PN}.png
+ make_desktop_entry ${PN}-setup "Allegro Setup" ${PN} "Settings"
+ fi
+}
diff --git a/media-libs/allegro/files/allegro-4.4.2-glibc228.patch b/media-libs/allegro/files/allegro-4.4.2-glibc228.patch
new file mode 100644
index 00000000000..afcdf5100c5
--- /dev/null
+++ b/media-libs/allegro/files/allegro-4.4.2-glibc228.patch
@@ -0,0 +1,41 @@
+From 4848f1583c3dbe41f5f056869ff2c796d33d8121 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20R=C3=B6nnquist?= <andreas@ronnquist.net>
+Date: Wed, 12 Dec 2018 16:39:23 +0100
+Subject: [PATCH] Remove f* variants of fixed math functions
+
+Removing functions that conflicts with later glibc implementations,
+people should use fix* variants instead.
+(Simply use fixadd instead of fadd).
+---
+ include/allegro/alcompat.h | 18 ------------------
+ 1 file changed, 18 deletions(-)
+
+diff --git a/include/allegro/alcompat.h b/include/allegro/alcompat.h
+index d31ab5b6d..c9536839d 100644
+--- a/include/allegro/alcompat.h
++++ b/include/allegro/alcompat.h
+@@ -40,24 +40,6 @@
+ #endif
+ #endif
+
+- #ifndef ALLEGRO_NO_FIX_ALIASES
+- AL_ALIAS(fixed fadd(fixed x, fixed y), fixadd(x, y))
+- AL_ALIAS(fixed fsub(fixed x, fixed y), fixsub(x, y))
+- AL_ALIAS(fixed fmul(fixed x, fixed y), fixmul(x, y))
+- AL_ALIAS(fixed fdiv(fixed x, fixed y), fixdiv(x, y))
+- AL_ALIAS(int fceil(fixed x), fixceil(x))
+- AL_ALIAS(int ffloor(fixed x), fixfloor(x))
+- AL_ALIAS(fixed fcos(fixed x), fixcos(x))
+- AL_ALIAS(fixed fsin(fixed x), fixsin(x))
+- AL_ALIAS(fixed ftan(fixed x), fixtan(x))
+- AL_ALIAS(fixed facos(fixed x), fixacos(x))
+- AL_ALIAS(fixed fasin(fixed x), fixasin(x))
+- AL_ALIAS(fixed fatan(fixed x), fixatan(x))
+- AL_ALIAS(fixed fatan2(fixed y, fixed x), fixatan2(y, x))
+- AL_ALIAS(fixed fsqrt(fixed x), fixsqrt(x))
+- AL_ALIAS(fixed fhypot(fixed x, fixed y), fixhypot(x, y))
+- #endif
+-
+ #endif /* !defined ALLEGRO_SRC */
+
+
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/allegro/, media-libs/allegro/files/
@ 2019-06-12 10:37 Andreas Sturmlechner
0 siblings, 0 replies; 8+ messages in thread
From: Andreas Sturmlechner @ 2019-06-12 10:37 UTC (permalink / raw
To: gentoo-commits
commit: 1b218b95d6ca03881780ee8604990d366fc3d46f
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 12 10:36:30 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jun 12 10:37:05 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b218b95
media-libs/allegro: Drop 5.0.11
Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-libs/allegro/Manifest | 1 -
media-libs/allegro/allegro-5.0.11.ebuild | 77 ----------------------
.../allegro/files/allegro-5.0.11-multilib.patch | 10 ---
.../allegro/files/allegro-5.0.11-underlink.patch | 11 ----
4 files changed, 99 deletions(-)
diff --git a/media-libs/allegro/Manifest b/media-libs/allegro/Manifest
index 49ee3f2dd78..b3d30b2e26c 100644
--- a/media-libs/allegro/Manifest
+++ b/media-libs/allegro/Manifest
@@ -1,4 +1,3 @@
DIST allegro-4.4.2.tar.gz 4674902 BLAKE2B 9f43fad416348425692481524f6c15808ee03946d93df4a072a46557817ccd5f6ae7eede908ca4a02a0a9e49f9a7c42909c48c14923b2155d3999ff370401006 SHA512 ad4bc1c15fc83bc8a019031fed82f37a793664bb6683cf023ec05fd9cd945f00f43764f3126892426036249c63afa5678fb4906407bb325ce5827b36aee0fa86
-DIST allegro-5.0.11.tar.gz 3203777 BLAKE2B b8946e58cde38fdf52f42e041fb27ea92e9589f3425c8047afa4d66ca466cb294e6c8efdc03f0e6942f665e4624c10e533a64bc77bcfaf132662b2123b97de34 SHA512 bcf3bec236d5dee11c789394144959d2a2f6028ae3d89a91a726f796d74f785c7f28749ac1cda94becaf18c31c76fcf75b8f2f6d1f2c32c52d556f967a406052
DIST allegro-5.2.4.0.tar.gz 7822903 BLAKE2B 50538e27276fbe1572a660b3f1396bdb9b542dc2aafaa819a4108e0e2771731cb6924cf1d0b7a7bfea1ff5c12b4772ff58dc571c81bb6a601d31a2083f5f9bea SHA512 c5f80191005165331635464ffd345369943d37dcb55345176a7171614e12826b25d9d74ab656333302d6682d404f1b46a5d94c0dd23d7873151e6e488d62c776
DIST allegro-5.2.5.0.tar.gz 7849326 BLAKE2B 8d8995b9ad252b81c534099ffd91d81bbdcf4a34f7ca7c4fb7dd97e5c075869c212fa68445a5fe479a675d755ad0414976c11cbc112ecdd61f1fa09704957b21 SHA512 c6341396ad7340233c1297ed122095e5c2d129a32da2350b4bb39c4b74f8d56d57ec4e608defec471d63fff51d786f0a9f3844be82f81cdb3d48d5bc49908b12
diff --git a/media-libs/allegro/allegro-5.0.11.ebuild b/media-libs/allegro/allegro-5.0.11.ebuild
deleted file mode 100644
index e5d44d7afb7..00000000000
--- a/media-libs/allegro/allegro-5.0.11.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-multilib
-
-DESCRIPTION="A game programming library"
-HOMEPAGE="https://liballeg.org/"
-SRC_URI="mirror://sourceforge/alleg/${P}.tar.gz"
-
-LICENSE="BSD ZLIB"
-SLOT="5"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="alsa dumb flac gtk jpeg openal oss physfs png pulseaudio test truetype vorbis X xinerama"
-
-RDEPEND="
- >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
- >=x11-libs/libXcursor-1.1.14[${MULTILIB_USEDEP}]
- >=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}]
- >=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}]
- >=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
- >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
- alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
- dumb? ( >=media-libs/dumb-0.9.3-r2[${MULTILIB_USEDEP}] )
- flac? ( >=media-libs/flac-1.2.1-r5[${MULTILIB_USEDEP}] )
- gtk? ( >=x11-libs/gtk+-2.24.23:2[${MULTILIB_USEDEP}] )
- jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
- openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] )
- physfs? ( >=dev-games/physfs-2.0.3-r1[${MULTILIB_USEDEP}] )
- png? ( >=media-libs/libpng-1.5.18:0[${MULTILIB_USEDEP}] )
- pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
- truetype? ( >=media-libs/freetype-2.5.0.1[${MULTILIB_USEDEP}] )
- vorbis? ( >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}] )
- xinerama? ( >=x11-libs/libXinerama-1.1.3[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
- >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
- x11-base/xorg-proto
-"
-
-PATCHES=( "${FILESDIR}"/${P}-{underlink,multilib}.patch )
-
-MULTILIB_WRAPPED_HEADERS=( /usr/include/allegro5/allegro_native_dialog.h )
-
-src_configure() {
- local mycmakeargs=(
- -DWANT_ALSA=$(usex alsa)
- -DWANT_DEMO=OFF
- -DWANT_EXAMPLES=OFF
- -DWANT_FLAC=$(usex flac)
- -DWANT_IMAGE_JPG=$(usex jpeg)
- -DWANT_IMAGE_PNG=$(usex png)
- -DWANT_MODAUDIO=$(usex dumb)
- -DWANT_OPENAL=$(usex openal)
- -DWANT_OSS=$(usex oss)
- -DWANT_PHYSFS=$(usex physfs)
- -DWANT_PULSEAUDIO=$(usex pulseaudio)
- -DWANT_TESTS=$(usex test)
- -DWANT_TTF=$(usex truetype)
- -DWANT_VORBIS=$(usex vorbis)
- -DWANT_NATIVE_DIALOG=$(usex gtk)
- -DWANT_OPENGL=$(usex X)
- -DWANT_X11=$(usex X)
- -DWANT_X11_XINERAMA=$(usex xinerama)
- )
-
- cmake-multilib_src_configure
-}
-
-src_install() {
- local HTML_DOCS=( docs/html/refman/. )
- cmake-multilib_src_install
-
- dodoc CHANGES-5.0.txt
- doman docs/man/*.3
-}
diff --git a/media-libs/allegro/files/allegro-5.0.11-multilib.patch b/media-libs/allegro/files/allegro-5.0.11-multilib.patch
deleted file mode 100644
index 8cd1dc1037b..00000000000
--- a/media-libs/allegro/files/allegro-5.0.11-multilib.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/CMakeLists.txt 2013-06-16 10:16:08.000000000 +0600
-+++ b/CMakeLists.txt 2016-02-25 14:32:40.350446191 +0500
-@@ -560,7 +560,6 @@
- endif(SUPPORT_X11 AND NOT SUPPORT_OPENGL)
-
- if(SUPPORT_X11)
-- set(CMAKE_REQUIRED_LIBRARIES ${X11_LIBRARIES})
-
- check_library_exists(Xcursor XcursorImageCreate "" CAN_XCURSOR)
- if(CAN_XCURSOR)
diff --git a/media-libs/allegro/files/allegro-5.0.11-underlink.patch b/media-libs/allegro/files/allegro-5.0.11-underlink.patch
deleted file mode 100644
index 1e0b502ed3e..00000000000
--- a/media-libs/allegro/files/allegro-5.0.11-underlink.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/CMakeLists.txt 2011-06-06 23:56:09.367125536 +0200
-+++ b/CMakeLists.txt 2011-06-06 23:56:19.311748807 +0200
-@@ -703,7 +703,7 @@
-
- if(ALLEGRO_UNIX) # not MACOSX
- list(APPEND LIBRARY_SOURCES ${ALLEGRO_SRC_UNIX_FILES})
-- list(APPEND PLATFORM_LIBS m ${CMAKE_THREAD_LIBS_INIT})
-+ list(APPEND PLATFORM_LIBS dl m ${CMAKE_THREAD_LIBS_INIT})
- endif(ALLEGRO_UNIX)
-
- if(SUPPORT_X11)
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/allegro/, media-libs/allegro/files/
@ 2019-09-30 21:34 James Le Cuirot
0 siblings, 0 replies; 8+ messages in thread
From: James Le Cuirot @ 2019-09-30 21:34 UTC (permalink / raw
To: gentoo-commits
commit: cb16966c9885f4a3f8a9f257dc890853bd1e46de
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 30 21:00:18 2019 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Mon Sep 30 21:33:46 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb16966c
media-libs/allegro: Patch around GLX_RGBA_FLOAT_BIT issue in 4.4.2
Thanks to Pablo Yanez Trujillo for the patch.
Closes: https://bugs.gentoo.org/672858
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
media-libs/allegro/allegro-4.4.2-r2.ebuild | 1 +
.../files/allegro-4.4.2-GLX_RGBA_FLOAT_BIT.patch | 20 ++++++++++++++++++++
2 files changed, 21 insertions(+)
diff --git a/media-libs/allegro/allegro-4.4.2-r2.ebuild b/media-libs/allegro/allegro-4.4.2-r2.ebuild
index 5797f5829b3..dba29ec2a94 100644
--- a/media-libs/allegro/allegro-4.4.2-r2.ebuild
+++ b/media-libs/allegro/allegro-4.4.2-r2.ebuild
@@ -46,6 +46,7 @@ PATCHES=(
"${FILESDIR}"/${P}-rpath.patch
"${FILESDIR}"/${P}-Werror-format-security.patch # bug 540470
"${FILESDIR}"/${P}-glibc228.patch # bug 670781
+ "${FILESDIR}"/${P}-GLX_RGBA_FLOAT_BIT.patch # bug 672858
)
src_prepare() {
diff --git a/media-libs/allegro/files/allegro-4.4.2-GLX_RGBA_FLOAT_BIT.patch b/media-libs/allegro/files/allegro-4.4.2-GLX_RGBA_FLOAT_BIT.patch
new file mode 100644
index 00000000000..54ff4f97fbb
--- /dev/null
+++ b/media-libs/allegro/files/allegro-4.4.2-GLX_RGBA_FLOAT_BIT.patch
@@ -0,0 +1,20 @@
+--- a/addons/allegrogl/src/x.c 2019-01-27 20:35:26.209055856 +0100
++++ b/addons/allegrogl/src/x.c 2019-01-27 20:38:54.135570782 +0100
+@@ -650,7 +650,7 @@
+ return -1;
+ }
+
+- if (!(render_type & GLX_RGBA_BIT) && !(render_type & GLX_RGBA_FLOAT_BIT)) {
++ if (!(render_type & GLX_RGBA_BIT) && !(render_type & GLX_RGBA_FLOAT_BIT_ARB)) {
+ TRACE(PREFIX_I "decode_fbconfig: Not RGBA mode\n");
+ return -1;
+ }
+@@ -674,7 +674,7 @@
+ /* Floating-point depth is not supported as glx extension (yet). */
+ i->float_depth = 0;
+
+- i->float_color = (render_type & GLX_RGBA_FLOAT_BIT);
++ i->float_color = (render_type & GLX_RGBA_FLOAT_BIT_ARB);
+
+ v = glXGetVisualFromFBConfig(_xwin.display, fbc);
+ if (!v) {
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/allegro/, media-libs/allegro/files/
@ 2019-10-03 20:48 James Le Cuirot
0 siblings, 0 replies; 8+ messages in thread
From: James Le Cuirot @ 2019-10-03 20:48 UTC (permalink / raw
To: gentoo-commits
commit: 361616ee4d919fd2c898f673cb50ea0ee2d8ba7c
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 3 20:47:19 2019 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Thu Oct 3 20:48:00 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=361616ee
media-libs/allegro: Patch against undefined ref to get_value in 4.4.2
Closes: https://bugs.gentoo.org/696034
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
media-libs/allegro/allegro-4.4.2-r2.ebuild | 1 +
media-libs/allegro/files/allegro-4.4.2-static-func.patch | 13 +++++++++++++
2 files changed, 14 insertions(+)
diff --git a/media-libs/allegro/allegro-4.4.2-r2.ebuild b/media-libs/allegro/allegro-4.4.2-r2.ebuild
index e808173e2f3..08dd7f1068c 100644
--- a/media-libs/allegro/allegro-4.4.2-r2.ebuild
+++ b/media-libs/allegro/allegro-4.4.2-r2.ebuild
@@ -47,6 +47,7 @@ PATCHES=(
"${FILESDIR}"/${P}-Werror-format-security.patch # bug 540470
"${FILESDIR}"/${P}-glibc228.patch # bug 670781
"${FILESDIR}"/${P}-GLX_RGBA_FLOAT_BIT.patch # bug 672858
+ "${FILESDIR}"/${P}-static-func.patch # bug 696034
)
src_prepare() {
diff --git a/media-libs/allegro/files/allegro-4.4.2-static-func.patch b/media-libs/allegro/files/allegro-4.4.2-static-func.patch
new file mode 100644
index 00000000000..ac107d387d5
--- /dev/null
+++ b/media-libs/allegro/files/allegro-4.4.2-static-func.patch
@@ -0,0 +1,13 @@
+https://sourceforge.net/p/alleg/bugs/398/
+
+--- a/addons/jpgalleg/src/decode.c 2008-02-13 14:04:57.000000000 +0100
++++ b/addons/jpgalleg/src/decode.c 2015-09-03 14:57:57.888485546 +0200
+@@ -477,7 +477,7 @@
+ * Reads a string of bits from the input stream and returns a properly signed
+ * number given the category.
+ */
+-INLINE int
++static INLINE int
+ get_value(int category)
+ {
+ int result = get_bits(category);
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/allegro/, media-libs/allegro/files/
@ 2020-02-22 23:31 James Le Cuirot
0 siblings, 0 replies; 8+ messages in thread
From: James Le Cuirot @ 2020-02-22 23:31 UTC (permalink / raw
To: gentoo-commits
commit: ad291e6a1efcf12fefaedfb7fe798eaa5248c081
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 22 23:23:10 2020 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat Feb 22 23:31:39 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad291e6a
media-libs/allegro: Patch around 4.4.3.1 texinfo encoding issue
Thanks to Red Hat for the patch.
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
media-libs/allegro/allegro-4.4.3.1.ebuild | 1 +
.../files/allegro-4.4.3.1-texinfo-encoding.patch | 19 +++++++++++++++++++
2 files changed, 20 insertions(+)
diff --git a/media-libs/allegro/allegro-4.4.3.1.ebuild b/media-libs/allegro/allegro-4.4.3.1.ebuild
index a00cbb33c6a..1f5e195f802 100644
--- a/media-libs/allegro/allegro-4.4.3.1.ebuild
+++ b/media-libs/allegro/allegro-4.4.3.1.ebuild
@@ -44,6 +44,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-4.4.2-underlink.patch
"${FILESDIR}"/${PN}-4.4.2-gentoo.patch
"${FILESDIR}"/${PN}-4.4.2-rpath.patch
+ "${FILESDIR}"/${PN}-4.4.3.1-texinfo-encoding.patch
)
src_prepare() {
diff --git a/media-libs/allegro/files/allegro-4.4.3.1-texinfo-encoding.patch b/media-libs/allegro/files/allegro-4.4.3.1-texinfo-encoding.patch
new file mode 100644
index 00000000000..1b6b52f7383
--- /dev/null
+++ b/media-libs/allegro/files/allegro-4.4.3.1-texinfo-encoding.patch
@@ -0,0 +1,19 @@
+From 7694155b74a4be1dedc9d13db6d9d2264d05f107 Mon Sep 17 00:00:00 2001
+From: Vitezslav Crhonek <vcrhonek@redhat.com>
+Date: Mon, 4 Nov 2019 12:07:16 +0100
+Subject: [PATCH] Fix FTBFS
+
+@documentencoding needed when generating documentation from
+non UTF-8 encoding source with texinfo-6.7 (rhbz#1767827)
+
+diff -up allegro-4.4.3/docs/src/allegro._tx.orig allegro-4.4.3/docs/src/allegro._tx
+--- allegro-4.4.3/docs/src/allegro._tx.orig 2019-02-02 20:28:46.000000000 +0100
++++ allegro-4.4.3/docs/src/allegro._tx 2019-11-04 11:12:39.352699777 +0100
+@@ -23,6 +23,7 @@
+ @man_shortdesc_force1=allegro
+ @man_shortdesc_force2=Allegro game programming library.
+ @$\input texinfo
++@$@documentencoding ISO-8859-1
+ @$@setfilename allegro.inf
+ @$@settitle Allegro Manual
+ @$@setchapternewpage odd
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/allegro/, media-libs/allegro/files/
@ 2021-01-19 0:08 Sam James
0 siblings, 0 replies; 8+ messages in thread
From: Sam James @ 2021-01-19 0:08 UTC (permalink / raw
To: gentoo-commits
commit: 40f87905372a14d909acab170d22216664fc3914
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 19 00:07:41 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jan 19 00:07:59 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40f87905
media-libs/allegro: cleanup old
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/allegro/Manifest | 1 -
media-libs/allegro/allegro-4.4.2-r2.ebuild | 115 ---------------------
.../files/allegro-4.4.2-GLX_RGBA_FLOAT_BIT.patch | 20 ----
.../allegro-4.4.2-Werror-format-security.patch | 107 -------------------
.../allegro/files/allegro-4.4.2-glibc228.patch | 41 --------
.../allegro/files/allegro-4.4.2-static-func.patch | 13 ---
6 files changed, 297 deletions(-)
diff --git a/media-libs/allegro/Manifest b/media-libs/allegro/Manifest
index 4158f3aee8f..0bebd4ad1f9 100644
--- a/media-libs/allegro/Manifest
+++ b/media-libs/allegro/Manifest
@@ -1,3 +1,2 @@
-DIST allegro-4.4.2.tar.gz 4674902 BLAKE2B 9f43fad416348425692481524f6c15808ee03946d93df4a072a46557817ccd5f6ae7eede908ca4a02a0a9e49f9a7c42909c48c14923b2155d3999ff370401006 SHA512 ad4bc1c15fc83bc8a019031fed82f37a793664bb6683cf023ec05fd9cd945f00f43764f3126892426036249c63afa5678fb4906407bb325ce5827b36aee0fa86
DIST allegro-4.4.3.1.tar.gz 4663634 BLAKE2B 23fa8cd77858243bfa8191f6bca26f50d1621fa84616968595c1284c73a86160cdbad201eece5bd026bb7ac13753568b6915295646b86e536b5d26c0394e2d1f SHA512 c5a552ab710226493447eb2547b3d7559badb96f511fbefd315b665b7486013a6710c83b69363eb09f90f53ef4278fe7b90cfee88d90d88f0fe8dc7df7606729
DIST allegro-5.2.6.0.tar.gz 7867726 BLAKE2B 3f21372442e5b8c802ac179019a11648febdcecddfda864559e1e9621f99c9ff7584fb422594c6fd3a1c352c892533c825faef10e35ecbf97058396fbb46fc7d SHA512 a475de67b0e6c727295cc51e113859eb0c57825a240e70bc45cd3b000c40518932b89cecdd13ba957416136db4ee9a9363adb5d3bfa7c8acda04ee95de6ba721
diff --git a/media-libs/allegro/allegro-4.4.2-r2.ebuild b/media-libs/allegro/allegro-4.4.2-r2.ebuild
deleted file mode 100644
index 0387f700f4a..00000000000
--- a/media-libs/allegro/allegro-4.4.2-r2.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CMAKE_IN_SOURCE_BUILD=1
-inherit cmake-utils desktop
-
-DESCRIPTION="cross-platform multimedia library"
-HOMEPAGE="https://liballeg.org/"
-SRC_URI="mirror://sourceforge/alleg/${P}.tar.gz"
-
-LICENSE="Allegro MIT GPL-2+ ZLIB"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~mips ppc ppc64 x86"
-IUSE="alsa fbcon jack jpeg opengl oss png svga test vga vorbis X"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- alsa? ( media-libs/alsa-lib )
- jack? ( media-sound/jack-audio-connection-kit )
- jpeg? ( virtual/jpeg:0 )
- png? ( media-libs/libpng:0= )
- svga? ( media-libs/svgalib )
- vorbis? ( media-libs/libvorbis )
- X? (
- x11-libs/libX11
- x11-libs/libXcursor
- x11-libs/libXext
- x11-libs/libXpm
- x11-libs/libXt
- x11-libs/libXxf86dga
- x11-libs/libXxf86vm
- opengl? (
- virtual/glu
- virtual/opengl
- )
- )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- X? ( x11-base/xorg-proto )"
-
-PATCHES=(
- "${FILESDIR}"/${P}-shared.patch
- "${FILESDIR}"/${P}-underlink.patch
- "${FILESDIR}"/${P}-gentoo.patch
- "${FILESDIR}"/${P}-rpath.patch
- "${FILESDIR}"/${P}-Werror-format-security.patch # bug 540470
- "${FILESDIR}"/${P}-glibc228.patch # bug 670781
- "${FILESDIR}"/${P}-GLX_RGBA_FLOAT_BIT.patch # bug 672858
- "${FILESDIR}"/${P}-static-func.patch # bug 696034
-)
-
-src_prepare() {
- cmake-utils_src_prepare
-
- sed -i \
- -e "s:allegro-\${ALLEGRO_VERSION}:${PF}:" \
- docs/CMakeLists.txt || die
-}
-
-src_configure() {
- # WANT_LINUX_CONSOLE is by default OFF
- # WANT_EXAMPLES doesn't install anything
- local mycmakeargs=(
- -DDOCDIR=share/doc
- -DMANDIR=share/man
- -DWANT_ALSA=$(usex alsa)
- -DWANT_DOCS_INFO=OFF
- -DWANT_EXAMPLES=OFF
- -DWANT_JACK=$(usex jack)
- -DWANT_JPGALLEG=$(usex jpeg)
- -DWANT_LINUX_CONSOLE=OFF
- -DWANT_LINUX_FBCON=$(usex fbcon)
- -DWANT_LINUX_SVGALIB=$(usex svga)
- -DWANT_LINUX_VGA=$(usex vga)
- -DWANT_LOADPNG=$(usex png)
- -DWANT_LOGG=$(usex vorbis)
- -DWANT_OSS=$(usex oss)
- -DWANT_TESTS=$(usex test)
- -DWANT_TOOLS=$(usex X)
- -DWANT_X11=$(usex X)
- )
-
- if use X; then
- mycmakeargs+=( -DWANT_ALLEGROGL=$(usex opengl) )
- else
- mycmakeargs+=( -DWANT_ALLEGROGL=OFF )
- fi
-
- cmake-utils_src_configure
-}
-
-src_install() {
- rm -r docs/html/{build,tmpfile.txt} || die
- local HTML_DOCS=( docs/html/. )
-
- cmake-utils_src_install
-
- #176020 (init_dialog.3), #409305 (key.3)
- pushd docs/man >/dev/null
- local manpage
- for manpage in $(ls -d *.3); do
- newman ${manpage} ${PN}-${manpage}
- done
- popd >/dev/null
-
- if use X; then
- newbin setup/setup ${PN}-setup
- insinto /usr/share/${PN}
- doins {keyboard,language,setup/setup}.dat
- newicon misc/icon.png ${PN}.png
- make_desktop_entry ${PN}-setup "Allegro Setup" ${PN} "Settings"
- fi
-}
diff --git a/media-libs/allegro/files/allegro-4.4.2-GLX_RGBA_FLOAT_BIT.patch b/media-libs/allegro/files/allegro-4.4.2-GLX_RGBA_FLOAT_BIT.patch
deleted file mode 100644
index 54ff4f97fbb..00000000000
--- a/media-libs/allegro/files/allegro-4.4.2-GLX_RGBA_FLOAT_BIT.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/addons/allegrogl/src/x.c 2019-01-27 20:35:26.209055856 +0100
-+++ b/addons/allegrogl/src/x.c 2019-01-27 20:38:54.135570782 +0100
-@@ -650,7 +650,7 @@
- return -1;
- }
-
-- if (!(render_type & GLX_RGBA_BIT) && !(render_type & GLX_RGBA_FLOAT_BIT)) {
-+ if (!(render_type & GLX_RGBA_BIT) && !(render_type & GLX_RGBA_FLOAT_BIT_ARB)) {
- TRACE(PREFIX_I "decode_fbconfig: Not RGBA mode\n");
- return -1;
- }
-@@ -674,7 +674,7 @@
- /* Floating-point depth is not supported as glx extension (yet). */
- i->float_depth = 0;
-
-- i->float_color = (render_type & GLX_RGBA_FLOAT_BIT);
-+ i->float_color = (render_type & GLX_RGBA_FLOAT_BIT_ARB);
-
- v = glXGetVisualFromFBConfig(_xwin.display, fbc);
- if (!v) {
diff --git a/media-libs/allegro/files/allegro-4.4.2-Werror-format-security.patch b/media-libs/allegro/files/allegro-4.4.2-Werror-format-security.patch
deleted file mode 100644
index b3b0bc30b34..00000000000
--- a/media-libs/allegro/files/allegro-4.4.2-Werror-format-security.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-diff -up allegro-4.4.2/src/unix/umodules.c~ allegro-4.4.2/src/unix/umodules.c
---- allegro-4.4.2/src/unix/umodules.c~ 2011-05-13 10:11:33.000000000 +0200
-+++ allegro-4.4.2/src/unix/umodules.c 2017-03-15 14:42:39.822612368 +0100
-@@ -126,11 +126,11 @@ void _unix_load_modules(int system_drive
- continue;
-
- if (!fullpath_slash) {
-- snprintf(fullpath, sizeof fullpath, filename);
-+ snprintf(fullpath, sizeof fullpath, "%s", filename);
- fullpath[(sizeof fullpath) - 1] = 0;
- }
- else {
-- snprintf(fullpath_slash+1, (sizeof fullpath) - (fullpath_slash - fullpath) - 1, filename);
-+ snprintf(fullpath_slash+1, (sizeof fullpath) - (fullpath_slash - fullpath) - 1, "%s", filename);
- fullpath[(sizeof fullpath) - 1] = 0;
- }
-
-diff -up allegro-4.4.2/src/linux/ljoy.c~ allegro-4.4.2/src/linux/ljoy.c
---- allegro-4.4.2/src/linux/ljoy.c~ 2010-02-20 06:18:16.000000000 +0100
-+++ allegro-4.4.2/src/linux/ljoy.c 2017-03-15 14:52:28.474215615 +0100
-@@ -93,7 +93,7 @@ static int joy_init(void)
-
- if (ioctl(joy_fd[i], JSIOCGVERSION, &raw_version) < 0) {
- /* NOTE: IOCTL fails if the joystick API is version 0.x */
-- uszprintf(allegro_error, ALLEGRO_ERROR_SIZE, get_config_text("Your Linux joystick API is version 0.x which is unsupported."));
-+ uszprintf(allegro_error, ALLEGRO_ERROR_SIZE, "%s", get_config_text("Your Linux joystick API is version 0.x which is unsupported."));
- return -1;
- }
-
-diff -up allegro-4.4.2/examples/extrans2.c~ allegro-4.4.2/examples/extrans2.c
---- allegro-4.4.2/examples/extrans2.c~ 2008-01-30 11:56:50.000000000 +0100
-+++ allegro-4.4.2/examples/extrans2.c 2017-03-15 15:43:03.494831521 +0100
-@@ -211,7 +211,7 @@ int main(int argc, char **argv)
- } else {
- msg = "no flipping";
- }
-- textprintf_ex(buffer, font, 1, 1, makecol(255, 255, 255), -1, msg);
-+ textprintf_ex(buffer, font, 1, 1, makecol(255, 255, 255), -1, "%s", msg);
-
- /* finally blit the back buffer on the screen */
- blit(buffer, screen, 0, 0, 0, 0, buffer->w, buffer->h);
-diff -up allegro-4.4.2/setup/setup.c~ allegro-4.4.2/setup/setup.c
---- allegro-4.4.2/setup/setup.c~ 2010-05-23 18:05:33.000000000 +0200
-+++ allegro-4.4.2/setup/setup.c 2017-03-15 16:13:42.243136380 +0100
-@@ -1163,7 +1163,7 @@ static void plot_joystick_state(BITMAP *
- textprintf_ex(bmp, font, SCREEN_W/2-96, SCREEN_H/2-60+c*20, -1, -1, uconvert_ascii("%s (%d/%d)", tmp),
- joystick_driver->name, i+1, num_joysticks);
- else
-- textprintf_ex(bmp, font, SCREEN_W/2-96, SCREEN_H/2-60+c*20, -1, -1, joystick_driver->name);
-+ textprintf_ex(bmp, font, SCREEN_W/2-96, SCREEN_H/2-60+c*20, -1, -1, "%s", joystick_driver->name);
- c++;
- }
-
-@@ -2879,7 +2879,7 @@ int main(void)
- alert(uconvert_ascii("Error loading " SETUP_DATA_FILE, tmp1), NULL, NULL, uconvert_ascii("OK", tmp2), NULL, 13, 0);
- #else
- set_gfx_mode(GFX_TEXT, 0, 0, 0, 0);
-- allegro_message(uconvert_ascii("Error loading " SETUP_DATA_FILE "\n", tmp1));
-+ allegro_message("%s", uconvert_ascii("Error loading " SETUP_DATA_FILE "\n", tmp1));
- #endif
- return 1;
- }
-diff -up allegro-4.4.2/examples/exkeys.c~ allegro-4.4.2/examples/exkeys.c
---- allegro-4.4.2/examples/exkeys.c~ 2008-01-10 20:46:00.000000000 +0100
-+++ allegro-4.4.2/examples/exkeys.c 2017-03-15 16:17:30.268545467 +0100
-@@ -193,7 +193,7 @@ int main(void)
- if (key_shifts & KB_NUMLOCK_FLAG) strcat(buf, " num");
- if (key_shifts & KB_SCROLOCK_FLAG) strcat(buf, " scrl");
- scroll();
-- textprintf_ex(screen, font, 8, SCREEN_H-16, makecol(0, 0, 0), makecol(255, 255, 255), buf);
-+ textprintf_ex(screen, font, 8, SCREEN_H-16, makecol(0, 0, 0), makecol(255, 255, 255), "%s", buf);
- } while (k != 27);
-
- /* various scan codes are defined in allegro.h as KEY_* constants */
-@@ -234,7 +234,7 @@ int main(void)
- if (key[KEY_8]) buf[8] = '8'; else buf[8] = ' ';
- if (key[KEY_9]) buf[9] = '9'; else buf[9] = ' ';
- buf[10] = 0;
-- textprintf_ex(screen, font, 8, SCREEN_H-16, makecol(0, 0, 0), makecol(255, 255, 255), buf);
-+ textprintf_ex(screen, font, 8, SCREEN_H-16, makecol(0, 0, 0), makecol(255, 255, 255), "%s", buf);
- rest(1);
- } while (!keypressed() || (readkey() >> 8) != KEY_ESC);
-
-diff -up allegro-4.4.2/tests/play.c~ allegro-4.4.2/tests/play.c
---- allegro-4.4.2/tests/play.c~ 2005-03-19 12:15:07.000000000 +0100
-+++ allegro-4.4.2/tests/play.c 2017-03-15 16:35:18.628156496 +0100
-@@ -74,7 +74,7 @@ void usage(void)
-
- strcat(msg, "\nIf you don't specify the card, Allegro will auto-detect (ie. guess :-)\n");
-
-- allegro_message(msg);
-+ allegro_message("%s", msg);
- free(msg);
- }
-
-diff -up allegro-4.2.3/tools/pack.c~ allegro-4.2.3/tools/pack.c
---- allegro-4.2.3/tools/pack.c~ 2006-05-20 16:49:58.000000000 +0200
-+++ allegro-4.2.3/tools/pack.c 2010-12-30 11:20:42.425231307 +0100
-@@ -42,7 +42,7 @@ static void err(char *s1, char *s2)
- printf(": %s", s1);
-
- if (s2)
-- printf(s2);
-+ printf("%s", s2);
-
- printf("\n");
-
diff --git a/media-libs/allegro/files/allegro-4.4.2-glibc228.patch b/media-libs/allegro/files/allegro-4.4.2-glibc228.patch
deleted file mode 100644
index afcdf5100c5..00000000000
--- a/media-libs/allegro/files/allegro-4.4.2-glibc228.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 4848f1583c3dbe41f5f056869ff2c796d33d8121 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20R=C3=B6nnquist?= <andreas@ronnquist.net>
-Date: Wed, 12 Dec 2018 16:39:23 +0100
-Subject: [PATCH] Remove f* variants of fixed math functions
-
-Removing functions that conflicts with later glibc implementations,
-people should use fix* variants instead.
-(Simply use fixadd instead of fadd).
----
- include/allegro/alcompat.h | 18 ------------------
- 1 file changed, 18 deletions(-)
-
-diff --git a/include/allegro/alcompat.h b/include/allegro/alcompat.h
-index d31ab5b6d..c9536839d 100644
---- a/include/allegro/alcompat.h
-+++ b/include/allegro/alcompat.h
-@@ -40,24 +40,6 @@
- #endif
- #endif
-
-- #ifndef ALLEGRO_NO_FIX_ALIASES
-- AL_ALIAS(fixed fadd(fixed x, fixed y), fixadd(x, y))
-- AL_ALIAS(fixed fsub(fixed x, fixed y), fixsub(x, y))
-- AL_ALIAS(fixed fmul(fixed x, fixed y), fixmul(x, y))
-- AL_ALIAS(fixed fdiv(fixed x, fixed y), fixdiv(x, y))
-- AL_ALIAS(int fceil(fixed x), fixceil(x))
-- AL_ALIAS(int ffloor(fixed x), fixfloor(x))
-- AL_ALIAS(fixed fcos(fixed x), fixcos(x))
-- AL_ALIAS(fixed fsin(fixed x), fixsin(x))
-- AL_ALIAS(fixed ftan(fixed x), fixtan(x))
-- AL_ALIAS(fixed facos(fixed x), fixacos(x))
-- AL_ALIAS(fixed fasin(fixed x), fixasin(x))
-- AL_ALIAS(fixed fatan(fixed x), fixatan(x))
-- AL_ALIAS(fixed fatan2(fixed y, fixed x), fixatan2(y, x))
-- AL_ALIAS(fixed fsqrt(fixed x), fixsqrt(x))
-- AL_ALIAS(fixed fhypot(fixed x, fixed y), fixhypot(x, y))
-- #endif
--
- #endif /* !defined ALLEGRO_SRC */
-
-
diff --git a/media-libs/allegro/files/allegro-4.4.2-static-func.patch b/media-libs/allegro/files/allegro-4.4.2-static-func.patch
deleted file mode 100644
index ac107d387d5..00000000000
--- a/media-libs/allegro/files/allegro-4.4.2-static-func.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://sourceforge.net/p/alleg/bugs/398/
-
---- a/addons/jpgalleg/src/decode.c 2008-02-13 14:04:57.000000000 +0100
-+++ b/addons/jpgalleg/src/decode.c 2015-09-03 14:57:57.888485546 +0200
-@@ -477,7 +477,7 @@
- * Reads a string of bits from the input stream and returns a properly signed
- * number given the category.
- */
--INLINE int
-+static INLINE int
- get_value(int category)
- {
- int result = get_bits(category);
^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2021-01-19 0:08 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-02-22 23:31 [gentoo-commits] repo/gentoo:master commit in: media-libs/allegro/, media-libs/allegro/files/ James Le Cuirot
-- strict thread matches above, loose matches on Subject: below --
2021-01-19 0:08 Sam James
2019-10-03 20:48 James Le Cuirot
2019-09-30 21:34 James Le Cuirot
2019-06-12 10:37 Andreas Sturmlechner
2019-01-05 21:26 Andreas K. Hüttel
2018-07-16 22:26 Andreas Sturmlechner
2016-02-29 6:43 Michael Sterrett
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox