* [gentoo-commits] repo/gentoo:master commit in: games-arcade/criticalmass/files/, games-arcade/criticalmass/
@ 2018-04-15 19:00 Pacho Ramos
0 siblings, 0 replies; 2+ messages in thread
From: Pacho Ramos @ 2018-04-15 19:00 UTC (permalink / raw
To: gentoo-commits
commit: b519680452841a787faa5a0ac208c1fc738611d1
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 15 18:49:09 2018 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun Apr 15 19:00:31 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5196804
games-arcade/criticalmass: Stop using games.eclass
Package-Manager: Portage-2.3.28, Repoman-2.3.9
.../criticalmass/criticalmass-1.0.2-r1.ebuild | 62 ++++++++++++++++++++++
.../files/criticalmass-1.0.2-cflags.patch | 4 +-
.../files/criticalmass-1.0.2-libpng14.patch | 4 +-
.../files/criticalmass-1.0.2-libpng15.patch | 8 +--
.../files/criticalmass-1.0.2-system_curl.patch | 12 ++---
5 files changed, 76 insertions(+), 14 deletions(-)
diff --git a/games-arcade/criticalmass/criticalmass-1.0.2-r1.ebuild b/games-arcade/criticalmass/criticalmass-1.0.2-r1.ebuild
new file mode 100644
index 00000000000..5191beb0107
--- /dev/null
+++ b/games-arcade/criticalmass/criticalmass-1.0.2-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools desktop flag-o-matic
+
+DESCRIPTION="SDL/OpenGL space shoot'em up game"
+HOMEPAGE="http://criticalmass.sourceforge.net/"
+SRC_URI="mirror://sourceforge/criticalmass/CriticalMass-${PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ media-libs/sdl-mixer
+ media-libs/sdl-image[png]
+ media-libs/libpng:0=
+ virtual/opengl
+ net-misc/curl
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/CriticalMass-${PV}"
+
+src_prepare() {
+ default
+
+ eapply "${FILESDIR}"/${P}-gcc43.patch \
+ "${FILESDIR}"/${P}-system_curl.patch \
+ "${FILESDIR}"/${P}-libpng14.patch \
+ "${FILESDIR}"/${P}-cflags.patch \
+ "${FILESDIR}"/${P}-libpng15.patch
+
+ rm -rf curl
+
+ mv configure.in configure.ac || die
+ eautoreconf
+}
+
+src_configure() {
+ append-cxxflags -std=gnu++98 # Bug 612758
+ default
+}
+
+src_install() {
+ HTML_DOCS="Readme.html"
+ default
+ rm -f "${ED}/usr/bin/Packer"
+ newicon critter.png ${PN}.png
+ make_desktop_entry critter "Critical Mass"
+}
+
+pkg_postinst() {
+ if ! has_version "media-libs/sdl-mixer[mod]" ; then
+ ewarn
+ ewarn "To hear music, you will have to rebuild media-libs/sdl-mixer"
+ ewarn "with the \"mod\" USE flag turned on."
+ ewarn
+ fi
+}
diff --git a/games-arcade/criticalmass/files/criticalmass-1.0.2-cflags.patch b/games-arcade/criticalmass/files/criticalmass-1.0.2-cflags.patch
index 8b801e51c2c..0d9063c3753 100644
--- a/games-arcade/criticalmass/files/criticalmass-1.0.2-cflags.patch
+++ b/games-arcade/criticalmass/files/criticalmass-1.0.2-cflags.patch
@@ -1,5 +1,5 @@
---- configure.in.orig 2011-07-20 11:23:19.849122541 -0400
-+++ configure.in 2011-07-20 11:24:28.169713094 -0400
+--- a/configure.in.orig 2011-07-20 11:23:19.849122541 -0400
++++ b/configure.in 2011-07-20 11:24:28.169713094 -0400
@@ -35,9 +35,6 @@
AM_CONDITIONAL(APPLE,test "x$TARGET" = xAPPLE)
AM_CONDITIONAL(WIN32,test "x$TARGET" = xWIN32)
diff --git a/games-arcade/criticalmass/files/criticalmass-1.0.2-libpng14.patch b/games-arcade/criticalmass/files/criticalmass-1.0.2-libpng14.patch
index 882869b43a1..f8a0eec2ad5 100644
--- a/games-arcade/criticalmass/files/criticalmass-1.0.2-libpng14.patch
+++ b/games-arcade/criticalmass/files/criticalmass-1.0.2-libpng14.patch
@@ -1,5 +1,5 @@
---- configure.in
-+++ configure.in
+--- a/configure.in
++++ b/configure.in
@@ -99,7 +99,7 @@ if test "x$TARGET" = xWIN32; then
else
LIBS="-L/usr/local/lib -L/usr/X11R6/lib $LIBS"
diff --git a/games-arcade/criticalmass/files/criticalmass-1.0.2-libpng15.patch b/games-arcade/criticalmass/files/criticalmass-1.0.2-libpng15.patch
index ac1b8c0c617..dbdfc9f3227 100644
--- a/games-arcade/criticalmass/files/criticalmass-1.0.2-libpng15.patch
+++ b/games-arcade/criticalmass/files/criticalmass-1.0.2-libpng15.patch
@@ -1,5 +1,5 @@
---- game/main.cpp
-+++ game/main.cpp
+--- a/game/main.cpp
++++ b/game/main.cpp
@@ -28,6 +28,8 @@
#include <sys/stat.h>
#include <sys/types.h>
@@ -9,8 +9,8 @@
void migrateConfig( void)
{
//if onlineCheck is not set, default it to true
---- utilssdl/PNG.cpp
-+++ utilssdl/PNG.cpp
+--- a/utilssdl/PNG.cpp
++++ b/utilssdl/PNG.cpp
@@ -45,7 +45,7 @@
{
png_size_t check;
diff --git a/games-arcade/criticalmass/files/criticalmass-1.0.2-system_curl.patch b/games-arcade/criticalmass/files/criticalmass-1.0.2-system_curl.patch
index 02307ad7d8f..1ab1a2d5ce5 100644
--- a/games-arcade/criticalmass/files/criticalmass-1.0.2-system_curl.patch
+++ b/games-arcade/criticalmass/files/criticalmass-1.0.2-system_curl.patch
@@ -1,5 +1,5 @@
---- configure.in
-+++ configure.in
+--- a/configure.in
++++ b/configure.in
@@ -115,8 +115,6 @@ fi
AC_CHECK_LIB(m, sin,,
AC_MSG_ERROR(libm is needed))
@@ -9,8 +9,8 @@
AC_OUTPUT(Makefile utils/Makefile utilssdl/Makefile utilsgl/Makefile game/Makefile tools/Makefile data/Makefile data/music/Makefile tinyxml/Makefile)
echo "Configuration:
---- game/Makefile.am
-+++ game/Makefile.am
+--- a/game/Makefile.am
++++ b/game/Makefile.am
@@ -41,7 +41,7 @@ critter_SOURCES = \
main.cpp
@@ -20,8 +20,8 @@
../utils/libutils.a \
../utilssdl/libutilssdl.a \
../utilsgl/libutilsgl.a \
---- Makefile.am
-+++ Makefile.am
+--- a/Makefile.am
++++ b/Makefile.am
@@ -4,7 +4,7 @@
AUTOMAKE_OPTIONS = 1.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-arcade/criticalmass/files/, games-arcade/criticalmass/
@ 2022-08-11 18:47 Ionen Wolkens
0 siblings, 0 replies; 2+ messages in thread
From: Ionen Wolkens @ 2022-08-11 18:47 UTC (permalink / raw
To: gentoo-commits
commit: ac4ee3fa01c26af03295d6a19582a4538e341ca3
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 11 17:29:01 2022 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu Aug 11 18:44:06 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac4ee3fa
games-arcade/criticalmass: EAPI6->8, misc changes
* use https for homepage
* depend on libsdl[opengl,sound,video] (doesn't launch without opengl)
* depend on zlib
* make dependency for music unconditional (generally feel audio/music
being a broken-if-missing optfeature is questionable for games, there
is an option to disable correctly in-game)
* tidy patches and add some bugrefs
* fix direct AR call (combined with -flags.patch)
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
.../criticalmass/criticalmass-1.0.2-r1.ebuild | 62 --------------
.../criticalmass/criticalmass-1.0.2-r2.ebuild | 53 ++++++++++++
.../files/criticalmass-1.0.2-cflags.patch | 27 ------
.../files/criticalmass-1.0.2-flags.patch | 24 ++++++
.../files/criticalmass-1.0.2-gcc43.patch | 99 +++++-----------------
.../files/criticalmass-1.0.2-libpng.patch | 28 ++++++
.../files/criticalmass-1.0.2-libpng14.patch | 11 ---
.../files/criticalmass-1.0.2-libpng15.patch | 31 -------
....patch => criticalmass-1.0.2-system-curl.patch} | 30 ++-----
9 files changed, 136 insertions(+), 229 deletions(-)
diff --git a/games-arcade/criticalmass/criticalmass-1.0.2-r1.ebuild b/games-arcade/criticalmass/criticalmass-1.0.2-r1.ebuild
deleted file mode 100644
index 5191beb0107f..000000000000
--- a/games-arcade/criticalmass/criticalmass-1.0.2-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools desktop flag-o-matic
-
-DESCRIPTION="SDL/OpenGL space shoot'em up game"
-HOMEPAGE="http://criticalmass.sourceforge.net/"
-SRC_URI="mirror://sourceforge/criticalmass/CriticalMass-${PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
- media-libs/sdl-mixer
- media-libs/sdl-image[png]
- media-libs/libpng:0=
- virtual/opengl
- net-misc/curl
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/CriticalMass-${PV}"
-
-src_prepare() {
- default
-
- eapply "${FILESDIR}"/${P}-gcc43.patch \
- "${FILESDIR}"/${P}-system_curl.patch \
- "${FILESDIR}"/${P}-libpng14.patch \
- "${FILESDIR}"/${P}-cflags.patch \
- "${FILESDIR}"/${P}-libpng15.patch
-
- rm -rf curl
-
- mv configure.in configure.ac || die
- eautoreconf
-}
-
-src_configure() {
- append-cxxflags -std=gnu++98 # Bug 612758
- default
-}
-
-src_install() {
- HTML_DOCS="Readme.html"
- default
- rm -f "${ED}/usr/bin/Packer"
- newicon critter.png ${PN}.png
- make_desktop_entry critter "Critical Mass"
-}
-
-pkg_postinst() {
- if ! has_version "media-libs/sdl-mixer[mod]" ; then
- ewarn
- ewarn "To hear music, you will have to rebuild media-libs/sdl-mixer"
- ewarn "with the \"mod\" USE flag turned on."
- ewarn
- fi
-}
diff --git a/games-arcade/criticalmass/criticalmass-1.0.2-r2.ebuild b/games-arcade/criticalmass/criticalmass-1.0.2-r2.ebuild
new file mode 100644
index 000000000000..550a1493e02e
--- /dev/null
+++ b/games-arcade/criticalmass/criticalmass-1.0.2-r2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools desktop flag-o-matic
+
+MY_P="CriticalMass-${PV}"
+
+DESCRIPTION="SDL/OpenGL space shoot'em up game"
+HOMEPAGE="https://criticalmass.sourceforge.io/"
+SRC_URI="mirror://sourceforge/criticalmass/${MY_P}.tar.bz2"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2+ ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ media-libs/libglvnd[X]
+ media-libs/libpng:=
+ media-libs/libsdl[opengl,sound,video]
+ media-libs/sdl-image[png]
+ media-libs/sdl-mixer[mod]
+ net-misc/curl
+ sys-libs/zlib:="
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-gcc43.patch
+ "${FILESDIR}"/${P}-system-curl.patch
+ "${FILESDIR}"/${P}-libpng.patch
+ "${FILESDIR}"/${P}-flags.patch
+)
+
+src_prepare() {
+ default
+
+ rm -r curl || die
+ eautoreconf
+
+ append-cxxflags -std=gnu++98 #612758
+}
+
+src_install() {
+ local HTML_DOCS="Readme.html"
+ default
+
+ rm "${ED}"/usr/bin/Packer || die #247449
+
+ newicon critter.png ${PN}.png
+ make_desktop_entry critter "Critical Mass"
+}
diff --git a/games-arcade/criticalmass/files/criticalmass-1.0.2-cflags.patch b/games-arcade/criticalmass/files/criticalmass-1.0.2-cflags.patch
deleted file mode 100644
index 0d9063c37538..000000000000
--- a/games-arcade/criticalmass/files/criticalmass-1.0.2-cflags.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/configure.in.orig 2011-07-20 11:23:19.849122541 -0400
-+++ b/configure.in 2011-07-20 11:24:28.169713094 -0400
-@@ -35,9 +35,6 @@
- AM_CONDITIONAL(APPLE,test "x$TARGET" = xAPPLE)
- AM_CONDITIONAL(WIN32,test "x$TARGET" = xWIN32)
-
--CFLAGS=""
--CXXFLAGS=""
--
- if test "x$GCC" = xyes; then
- CFLAGS="$CFLAGS -W -Wall"
- CXXFLAGS="$CXXFLAGS -W -Wall -fno-exceptions"
-@@ -51,14 +48,6 @@
- CXXFLAGS="$CXXFLAGS -g"
- fi
-
--AC_ARG_ENABLE(optimize,
--[ --enable-optimize=level Enable optimization [default=2]],
-- enable_optmize=$enableval, enable_optimize=2)
--if test "x$enable_optimize" != "xno" ; then
-- CFLAGS="$CFLAGS -O$enable_optimize"
-- CXXFLAGS="$CXXFLAGS -O$enable_optimize"
--fi
--
- AC_ARG_ENABLE(dyngl,
- [ --enable-dyngl Load GL library dynamically [default=off]],
- enable_dyngl=$enableval, enable_dyngl=off)
diff --git a/games-arcade/criticalmass/files/criticalmass-1.0.2-flags.patch b/games-arcade/criticalmass/files/criticalmass-1.0.2-flags.patch
new file mode 100644
index 000000000000..5677211c78a2
--- /dev/null
+++ b/games-arcade/criticalmass/files/criticalmass-1.0.2-flags.patch
@@ -0,0 +1,24 @@
+https://bugs.gentoo.org/375739
+--- a/configure.in
++++ b/configure.in
+@@ -24,2 +24,3 @@
+ AC_PROG_RANLIB
++AM_PROG_AR
+
+@@ -37,5 +38,2 @@
+
+-CFLAGS=""
+-CXXFLAGS=""
+-
+ if test "x$GCC" = xyes; then
+@@ -52,10 +50,2 @@
+ fi
+-
+-AC_ARG_ENABLE(optimize,
+-[ --enable-optimize=level Enable optimization [default=2]],
+- enable_optmize=$enableval, enable_optimize=2)
+-if test "x$enable_optimize" != "xno" ; then
+- CFLAGS="$CFLAGS -O$enable_optimize"
+- CXXFLAGS="$CXXFLAGS -O$enable_optimize"
+-fi
+
diff --git a/games-arcade/criticalmass/files/criticalmass-1.0.2-gcc43.patch b/games-arcade/criticalmass/files/criticalmass-1.0.2-gcc43.patch
index e57c11f5af28..82207f52aec0 100644
--- a/games-arcade/criticalmass/files/criticalmass-1.0.2-gcc43.patch
+++ b/games-arcade/criticalmass/files/criticalmass-1.0.2-gcc43.patch
@@ -1,101 +1,46 @@
---- CriticalMass-1.0.0.orig/tinyxml/tinyxml.cpp 2003-03-03 03:34:58.000000000 +0100
-+++ CriticalMass-1.0.0/tinyxml/tinyxml.cpp 2008-04-18 19:40:35.000000000 +0200
-@@ -21,10 +21,12 @@
- distribution.
- */
-
- #include "tinyxml.h"
+https://bugs.gentoo.org/218299
+--- a/tinyxml/tinyxml.cpp
++++ b/tinyxml/tinyxml.cpp
+@@ -25,2 +25,4 @@
+#include <cstring>
+
- TiXmlNode::TiXmlNode( NodeType _type )
- {
- parent = 0;
- type = _type;
---- CriticalMass-1.0.0.orig/tinyxml/tinyxml.h 2003-03-03 03:34:58.000000000 +0100
-+++ CriticalMass-1.0.0/tinyxml/tinyxml.h 2008-04-18 19:40:35.000000000 +0200
-@@ -28,10 +28,11 @@
- #ifdef _MSC_VER
- #pragma warning( disable : 4530 )
- #pragma warning( disable : 4786 )
- #endif
+--- a/tinyxml/tinyxml.h
++++ b/tinyxml/tinyxml.h
+@@ -32,2 +32,3 @@
+#include <cstdlib>
#include <string>
- #include <stdio.h>
- #include <assert.h>
-
- class TiXmlDocument;
---- CriticalMass-1.0.0.orig/tinyxml/tinyxmlparser.cpp 2003-03-03 03:34:58.000000000 +0100
-+++ CriticalMass-1.0.0/tinyxml/tinyxmlparser.cpp 2008-04-18 19:40:35.000000000 +0200
-@@ -23,10 +23,12 @@
-
-
- #include "tinyxml.h"
- #include <ctype.h>
+--- a/tinyxml/tinyxmlparser.cpp
++++ b/tinyxml/tinyxmlparser.cpp
+@@ -27,2 +27,4 @@
+#include <cstring>
+
const char* TiXmlBase::SkipWhiteSpace( const char* p )
- {
- while ( p && *p &&
- ( isspace( *p ) || *p == '\n' || *p == '\r' ) )
- p++;
---- CriticalMass-1.0.0.orig/utils/ResourceManager.cpp 2005-01-02 03:59:29.000000000 +0100
-+++ CriticalMass-1.0.0/utils/ResourceManager.cpp 2008-04-18 19:40:35.000000000 +0200
-@@ -20,10 +20,12 @@
- #include <ResourceManager.hpp>
- #include <FindHash.hpp>
- #include <Endian.hpp>
- #include <WalkDirectory.hpp>
+--- a/utils/ResourceManager.cpp
++++ b/utils/ResourceManager.cpp
+@@ -24,2 +24,4 @@
+#include <cstring>
+
#ifdef WIN32
- const char PATH_SEPERATOR = '\\';
- #else
- const char PATH_SEPERATOR = '/';
- #endif
---- CriticalMass-1.0.0.orig/utils/Value.hpp 2004-12-18 03:41:24.000000000 +0100
-+++ CriticalMass-1.0.0/utils/Value.hpp 2008-04-18 19:40:35.000000000 +0200
-@@ -13,10 +13,11 @@
- // FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details
- //
- #ifndef _Value_hpp_
- #define _Value_hpp_
+--- a/utils/Value.hpp
++++ b/utils/Value.hpp
+@@ -17,2 +17,3 @@
+#include <cstdlib>
#include <stdio.h>
- #include <string>
-
- #include <Trace.hpp>
-
---- CriticalMass-1.0.0.orig/utils/zStreamBufferImplZLib.cpp 2005-07-31 22:06:14.000000000 +0200
-+++ CriticalMass-1.0.0/utils/zStreamBufferImplZLib.cpp 2008-04-18 19:40:35.000000000 +0200
-@@ -10,10 +10,11 @@
- //
- // This program is distributed in the hope that it will be useful, but WITHOUT
- // ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- // FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details
+--- a/utils/zStream.cpp
++++ b/utils/zStream.cpp
+@@ -14,2 +14,3 @@
//
+#include <cstdlib>
#include <Trace.hpp>
- #include <zStreamBufferImplZLib.hpp>
-
- bool ziStreamBufferImplZLib::init( void)
- {
---- CriticalMass-1.0.0.orig/utils/zStream.cpp 2005-07-31 22:06:14.000000000 +0200
-+++ CriticalMass-1.0.0/utils/zStream.cpp 2008-04-18 19:40:35.000000000 +0200
-@@ -10,10 +10,11 @@
- //
- // This program is distributed in the hope that it will be useful, but WITHOUT
- // ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- // FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details
+--- a/utils/zStreamBufferImplZLib.cpp
++++ b/utils/zStreamBufferImplZLib.cpp
+@@ -14,2 +14,3 @@
//
+#include <cstdlib>
#include <Trace.hpp>
- #include <Endian.hpp>
- #include <zStream.hpp>
- #include <zStreamBufferImplLZMA.hpp>
- #include <zStreamBufferImplZLib.hpp>
diff --git a/games-arcade/criticalmass/files/criticalmass-1.0.2-libpng.patch b/games-arcade/criticalmass/files/criticalmass-1.0.2-libpng.patch
new file mode 100644
index 000000000000..c2ea21bb2d63
--- /dev/null
+++ b/games-arcade/criticalmass/files/criticalmass-1.0.2-libpng.patch
@@ -0,0 +1,28 @@
+https://bugs.gentoo.org/206258
+https://bugs.gentoo.org/383207
+--- a/configure.in
++++ b/configure.in
+@@ -101,3 +101,3 @@
+ CXXFLAGS="$CXXFLAGS -I/usr/X11R6/include"
+- AC_CHECK_LIB(png12, main,, AC_MSG_ERROR(libpng is needed))
++ AC_CHECK_LIB(png, main,, AC_MSG_ERROR(libpng is needed))
+ AC_CHECK_LIB(z, main,, AC_MSG_ERROR(libz is needed))
+--- a/game/main.cpp
++++ b/game/main.cpp
+@@ -30,2 +30,4 @@
+
++#include <zlib.h>
++
+ void migrateConfig( void)
+--- a/utilssdl/PNG.cpp
++++ b/utilssdl/PNG.cpp
+@@ -47,3 +47,3 @@
+
+- check = fwrite( data, 1, length, (FILE *)(png->io_ptr));
++ check = fwrite( data, 1, length, (FILE *)(png_get_io_ptr(png)));
+ if( check != length)
+@@ -74,3 +74,3 @@
+
+- if( setjmp(_png->jmpbuf))
++ if( setjmp(png_jmpbuf(_png)))
+ {
diff --git a/games-arcade/criticalmass/files/criticalmass-1.0.2-libpng14.patch b/games-arcade/criticalmass/files/criticalmass-1.0.2-libpng14.patch
deleted file mode 100644
index f8a0eec2ad57..000000000000
--- a/games-arcade/criticalmass/files/criticalmass-1.0.2-libpng14.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -99,7 +99,7 @@ if test "x$TARGET" = xWIN32; then
- else
- LIBS="-L/usr/local/lib -L/usr/X11R6/lib $LIBS"
- CXXFLAGS="$CXXFLAGS -I/usr/X11R6/include"
-- AC_CHECK_LIB(png12, main,, AC_MSG_ERROR(libpng is needed))
-+ AC_CHECK_LIB(png, main,, AC_MSG_ERROR(libpng is needed))
- AC_CHECK_LIB(z, main,, AC_MSG_ERROR(libz is needed))
- if test "x$TARGET" = xUNIX; then
- if test "x$enable_dyngl" = xoff; then
diff --git a/games-arcade/criticalmass/files/criticalmass-1.0.2-libpng15.patch b/games-arcade/criticalmass/files/criticalmass-1.0.2-libpng15.patch
deleted file mode 100644
index dbdfc9f32275..000000000000
--- a/games-arcade/criticalmass/files/criticalmass-1.0.2-libpng15.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/game/main.cpp
-+++ b/game/main.cpp
-@@ -28,6 +28,8 @@
- #include <sys/stat.h>
- #include <sys/types.h>
-
-+#include <zlib.h>
-+
- void migrateConfig( void)
- {
- //if onlineCheck is not set, default it to true
---- a/utilssdl/PNG.cpp
-+++ b/utilssdl/PNG.cpp
-@@ -45,7 +45,7 @@
- {
- png_size_t check;
-
-- check = fwrite( data, 1, length, (FILE *)(png->io_ptr));
-+ check = fwrite( data, 1, length, (FILE *)(png_get_io_ptr(png)));
- if( check != length)
- {
- png_error( png, "Write Error");
-@@ -72,7 +72,7 @@
- return false;
- }
-
-- if( setjmp(_png->jmpbuf))
-+ if( setjmp(png_jmpbuf(_png)))
- {
- fclose( fp);
- png_destroy_write_struct(&_png, (png_infopp)NULL);
diff --git a/games-arcade/criticalmass/files/criticalmass-1.0.2-system_curl.patch b/games-arcade/criticalmass/files/criticalmass-1.0.2-system-curl.patch
similarity index 57%
rename from games-arcade/criticalmass/files/criticalmass-1.0.2-system_curl.patch
rename to games-arcade/criticalmass/files/criticalmass-1.0.2-system-curl.patch
index 1ab1a2d5ce52..084efbc05cf2 100644
--- a/games-arcade/criticalmass/files/criticalmass-1.0.2-system_curl.patch
+++ b/games-arcade/criticalmass/files/criticalmass-1.0.2-system-curl.patch
@@ -1,33 +1,21 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -6,3 +6,3 @@
+ ## Any directories that you want built and installed should go here.
+-SUBDIRS = curl tinyxml utils utilssdl utilsgl tools data game
++SUBDIRS = tinyxml utils utilssdl utilsgl tools data game
+
--- a/configure.in
+++ b/configure.in
-@@ -115,8 +115,6 @@ fi
- AC_CHECK_LIB(m, sin,,
- AC_MSG_ERROR(libm is needed))
+@@ -121,4 +121,2 @@
-AC_CONFIG_SUBDIRS(curl)
-
AC_OUTPUT(Makefile utils/Makefile utilssdl/Makefile utilsgl/Makefile game/Makefile tools/Makefile data/Makefile data/music/Makefile tinyxml/Makefile)
-
- echo "Configuration:
--- a/game/Makefile.am
+++ b/game/Makefile.am
-@@ -41,7 +41,7 @@ critter_SOURCES = \
- main.cpp
-
+@@ -43,3 +43,3 @@
LDADD = \
- ../curl/lib/libcurl.a \
+ -lcurl \
../utils/libutils.a \
- ../utilssdl/libutilssdl.a \
- ../utilsgl/libutilsgl.a \
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -4,7 +4,7 @@
- AUTOMAKE_OPTIONS = 1.4
-
- ## Any directories that you want built and installed should go here.
--SUBDIRS = curl tinyxml utils utilssdl utilsgl tools data game
-+SUBDIRS = tinyxml utils utilssdl utilsgl tools data game
-
- ## Any directories you want a part of the distribution should be listed
- ## here, as well as have a Makefile generated at the end of configure.in
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-08-11 18:47 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-08-11 18:47 [gentoo-commits] repo/gentoo:master commit in: games-arcade/criticalmass/files/, games-arcade/criticalmass/ Ionen Wolkens
-- strict thread matches above, loose matches on Subject: below --
2018-04-15 19:00 Pacho Ramos
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox