From a0ce545d52f231499bf9f3644493113d8af58ec9 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 9 May 2024 00:01:03 +0100 Subject: gentoo auto-resync : 09:05:2024 - 00:01:03 --- media-libs/libggi/Manifest | 3 +- .../files/libggi-2.2.2-incompatible-types.patch | 12 ++++ media-libs/libggi/libggi-2.2.2-r1.ebuild | 75 --------------------- media-libs/libggi/libggi-2.2.2-r2.ebuild | 76 ++++++++++++++++++++++ 4 files changed, 90 insertions(+), 76 deletions(-) create mode 100644 media-libs/libggi/files/libggi-2.2.2-incompatible-types.patch delete mode 100644 media-libs/libggi/libggi-2.2.2-r1.ebuild create mode 100644 media-libs/libggi/libggi-2.2.2-r2.ebuild (limited to 'media-libs/libggi') diff --git a/media-libs/libggi/Manifest b/media-libs/libggi/Manifest index 5d8a6a18260f..a2f6598c47bb 100644 --- a/media-libs/libggi/Manifest +++ b/media-libs/libggi/Manifest @@ -1,4 +1,5 @@ +AUX libggi-2.2.2-incompatible-types.patch 475 BLAKE2B cc6a0d956e6d2aeed9e5328c0e4411db4d1c2dce818ce8af5aac7335efdaece6c9f233d3ec7a7a0e9e3425b8e28e83950b4caf05d42e39caf22a73c082f54f4b SHA512 dfa1825db363979cea9eb75e27d149f8ed696b89ebe157158693581bcc222ca0f83c8f7cae8ca615cd7f7d77509d69383b3beb875b396de1108fd177f7070d2b AUX libggi-2.2.2-slibtool.patch 2105 BLAKE2B 5cb1f3ede56aa35a5eecdbe49e649b5c512f267bc33c993355d4707c35e090c53586b1a7416262f40066207e6cd41ec8720047b37447b62103a9b94953ebd164 SHA512 f9eaaf862fe1ad7ba1baa29a9016ae810aaf7d054d23ed36512a59076c23e1ce359e08653f6cd13641e6136e023aa4fe511ad545fc4763f0472b0f400965d323 DIST libggi-2.2.2.src.tar.bz2 1071939 BLAKE2B e583ed802cffe825cec2575ee8d33e619ca5537c841380e12e4b5d07e485b4a3d515936d8b2f4763522b26c5302ccdd2de98810d85243408acaca64b04e520ac SHA512 ee2038dc64cea43994fa1ac716f1062462d17b0bbf30fd9a9d2762e7424a43fedc7c573178d9472738a5069ff3bf977ac26957c0c262c51cdf1065b616370975 -EBUILD libggi-2.2.2-r1.ebuild 1603 BLAKE2B 65af6ebb7d658a284ae2fc9f66108bb5191f157b25eb65324f78c077fcdb416eee137038167b3514315aa148d6328f2ba0ae5afa47ceae3edadd3e5dc21ee34b SHA512 42980b5119d9e060884b33930c424cbc876e5e8df40b717d710d1bc0120447a67d099cc49bde70b6d42674a3463046d74cdd87b9151c4136767a0d0b2f5809d7 +EBUILD libggi-2.2.2-r2.ebuild 1657 BLAKE2B b7382a6a899b059e1e82084d73d97228adf9c588eb8ac50e1d682a759310fc1fa13ed72f5de7a40924255d35f07ff2ac823c575078f0f57050af95e4bd919109 SHA512 3bab20f757617bd519277307832c10002c8a1fd821fbec4a5b220100ca3494af310947c9e22cf757bf8d61e1c6857d6e1b7f5dd29311cfdca05ee6c7300aca97 MISC metadata.xml 485 BLAKE2B 6d6d108c523eb917020b6292c303f86749350862790c7bc873c8582bb302f91e028745978d865cb65f5122bff3783ca9e0a5d81912a4bda87c47ae8de9573b53 SHA512 bccc6fc464d0d353628d61b3f9ef3271b5bc08fb959113ec92f72813ed7c7483323c2a610af6a35fecf1ce722e856aa98907673308f84fd0617e83b8128899dc diff --git a/media-libs/libggi/files/libggi-2.2.2-incompatible-types.patch b/media-libs/libggi/files/libggi-2.2.2-incompatible-types.patch new file mode 100644 index 000000000000..dc5dec5e6056 --- /dev/null +++ b/media-libs/libggi/files/libggi-2.2.2-incompatible-types.patch @@ -0,0 +1,12 @@ +Closes: https://bugs.gentoo.org/880931 +--- a/display/X/helper/dga/dga.c 2024-03-27 20:58:09.954061371 +0400 ++++ b/display/X/helper/dga/dga.c 2024-03-27 20:58:26.408971886 +0400 +@@ -261,7 +261,7 @@ + + /* This function performs the CheckMode operation and returns + * the number of the best mode. */ +-static int ggi_xdga_validate_mode(ggi_visual * vis, int num, ++static int ggi_xdga_validate_mode(ggi_visual * vis, long int num, + ggi_mode * mode) + { + ggi_x_priv *priv; diff --git a/media-libs/libggi/libggi-2.2.2-r1.ebuild b/media-libs/libggi/libggi-2.2.2-r1.ebuild deleted file mode 100644 index 5c776bc44459..000000000000 --- a/media-libs/libggi/libggi-2.2.2-r1.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools - -DESCRIPTION="Provides an opaque interface to the display's acceleration function" -HOMEPAGE="https://ibiblio.org/ggicore/packages/libggi.html" -SRC_URI="https://downloads.sourceforge.net/ggi/${P}.src.tar.bz2" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86" -IUSE="3dfx aalib cpu_flags_x86_mmx debug fbcon svga vis X" - -RDEPEND=">=media-libs/libgii-1.0.2 - aalib? ( >=media-libs/aalib-1.2-r1 ) - svga? ( >=media-libs/svgalib-1.4.2 ) - X? ( - x11-libs/libXt - x11-libs/libXxf86dga - x11-libs/libXxf86vm - )" -DEPEND="${RDEPEND} - X? ( x11-base/xorg-proto )" - -DOCS=( ChangeLog ChangeLog.1999 FAQ NEWS README ) - -PATCHES=( - "${FILESDIR}/${P}-slibtool.patch" # 775584 -) - -src_prepare() { - default - - # We really don't want this - # https://sourceforge.net/p/ggi/patches/7/ - rm -f acinclude.m4 || die - - eautoreconf -} - -src_configure() { - local myconf="" - - use svga || myconf="${myconf} --disable-svga --disable-vgagl" - - if use amd64 || use ppc64 || use ia64 ; then - myconf="${myconf} --enable-64bitc" - else - myconf="${myconf} --disable-64bitc" - fi - - econf $(use_enable 3dfx glide) \ - $(use_enable aalib aa) \ - $(use_enable debug) \ - $(use_enable cpu_flags_x86_mmx mmx) \ - $(use_enable vis) \ - $(use_with X x) \ - $(use_enable X x) \ - $(use_enable fbcon fbdev) \ - --disable-directfb \ - --disable-static \ - ${myconf} -} - -src_install() { - default - - docinto txt - dodoc doc/*.txt - - find "${D}" -name '*.la' -delete || die -} diff --git a/media-libs/libggi/libggi-2.2.2-r2.ebuild b/media-libs/libggi/libggi-2.2.2-r2.ebuild new file mode 100644 index 000000000000..ad874eeb201b --- /dev/null +++ b/media-libs/libggi/libggi-2.2.2-r2.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools + +DESCRIPTION="Provides an opaque interface to the display's acceleration function" +HOMEPAGE="https://ibiblio.org/ggicore/packages/libggi.html" +SRC_URI="https://downloads.sourceforge.net/ggi/${P}.src.tar.bz2" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86" +IUSE="3dfx aalib cpu_flags_x86_mmx debug fbcon svga vis X" + +RDEPEND=">=media-libs/libgii-1.0.2 + aalib? ( >=media-libs/aalib-1.2-r1 ) + svga? ( >=media-libs/svgalib-1.4.2 ) + X? ( + x11-libs/libXt + x11-libs/libXxf86dga + x11-libs/libXxf86vm + )" +DEPEND="${RDEPEND} + X? ( x11-base/xorg-proto )" + +DOCS=( ChangeLog ChangeLog.1999 FAQ NEWS README ) + +PATCHES=( + "${FILESDIR}/${P}-slibtool.patch" # 775584 + "${FILESDIR}/${P}-incompatible-types.patch" # 880931 +) + +src_prepare() { + default + + # We really don't want this + # https://sourceforge.net/p/ggi/patches/7/ + rm -f acinclude.m4 || die + + eautoreconf +} + +src_configure() { + local myconf="" + + use svga || myconf="${myconf} --disable-svga --disable-vgagl" + + if use amd64 || use ppc64 || use ia64 ; then + myconf="${myconf} --enable-64bitc" + else + myconf="${myconf} --disable-64bitc" + fi + + econf $(use_enable 3dfx glide) \ + $(use_enable aalib aa) \ + $(use_enable debug) \ + $(use_enable cpu_flags_x86_mmx mmx) \ + $(use_enable vis) \ + $(use_with X x) \ + $(use_enable X x) \ + $(use_enable fbcon fbdev) \ + --disable-directfb \ + --disable-static \ + ${myconf} +} + +src_install() { + default + + docinto txt + dodoc doc/*.txt + + find "${D}" -name '*.la' -delete || die +} -- cgit v1.2.3