Attachment 876047 Details for Bug 1077861 – Build with system quesoglc and miniupnpc instead of bundled ones

[patch] Build with system quesoglc and miniupnpc instead of bundled ones

Build-with-system-quesoglc-and-miniupnpc-instead-o.patch (text/plain), 8.45 KB, created by Ville Skyttä on 2014-03-18 17:55:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ville Skyttä

Created: 2014-03-18 17:55:01 UTC

Size: 8.45 KB

patch

obsolete

>From 2a515201f865c3e359dc6de06f844550c8da2140 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
>Date: Tue, 18 Mar 2014 19:51:08 +0200
>Subject: [PATCH] Build with system quesoglc and miniupnpc instead of bundled
> ones
>
>https://bugzilla.redhat.com/show_bug.cgi?id=1077861
>---
> warzone2100-3.1.1-syslibs.patch | 131 ++++++++++++++++++++++++++++++++++++++++
> warzone2100.spec                |  13 +++-
> 2 files changed, 142 insertions(+), 2 deletions(-)
> create mode 100644 warzone2100-3.1.1-syslibs.patch
>
>diff --git a/warzone2100-3.1.1-syslibs.patch b/warzone2100-3.1.1-syslibs.patch
>new file mode 100644
>index 0000000..a59e7d0
>--- /dev/null
>+++ b/warzone2100-3.1.1-syslibs.patch
>@@ -0,0 +1,131 @@
>+diff --git a/Makefile.am b/Makefile.am
>+index 1ceabf2..711d2b7 100644
>+--- a/Makefile.am
>++++ b/Makefile.am
>+@@ -6,8 +6,6 @@ endif
>+ 
>+ SUBDIRS = \
>+ 	win32 \
>+-	3rdparty/miniupnpc \
>+-	3rdparty/quesoglc \
>+ 	lib/framework \
>+ 	lib/exceptionhandler \
>+ 	lib/script \
>+diff --git a/Makefile.in b/Makefile.in
>+index 7e95f37..21c252d 100644
>+--- a/Makefile.in
>++++ b/Makefile.in
>+@@ -341,8 +341,6 @@ top_srcdir = @top_srcdir@
>+ @BACKEND_QT_TRUE@backend_subdir = lib/qtgame
>+ SUBDIRS = \
>+ 	win32 \
>+-	3rdparty/miniupnpc \
>+-	3rdparty/quesoglc \
>+ 	lib/framework \
>+ 	lib/exceptionhandler \
>+ 	lib/script \
>+diff --git a/configure b/configure
>+index 0c0b538..e0773e0 100755
>+--- a/configure
>++++ b/configure
>+@@ -11520,8 +11520,6 @@ WZ_CPPFLAGS="${WZ_CPPFLAGS} -DWZ_DATADIR=\"\\\"\${datadir}/\${PACKAGE}\\\"\""
>+ WZ_CPPFLAGS="${WZ_CPPFLAGS} -DLOCALEDIR=\"\\\"\${localedir}\\\"\""
>+ WZ_CPPFLAGS="${WZ_CPPFLAGS} -I\$(top_srcdir)"
>+ 
>+-# 3rdparty libs
>+-WZ_CPPFLAGS="${WZ_CPPFLAGS} -I\$(top_srcdir)/3rdparty -I\$(top_srcdir)/3rdparty/quesoglc"
>+ 
>+ 
>+ WZ_CPPFLAGS=${WZ_CPPFLAGS}
>+@@ -11536,7 +11534,7 @@ WZ_C99FLAGS=${WZ_C99FLAGS}
>+ 
>+ ac_config_headers="$ac_config_headers config.h"
>+ 
>+-ac_config_files="$ac_config_files Makefile po/Makefile.in doc/Makefile icons/Makefile data/Makefile data/music/Makefile pkg/nsis/Makefile win32/Makefile tests/Makefile 3rdparty/miniupnpc/Makefile 3rdparty/quesoglc/Makefile lib/framework/Makefile lib/exceptionhandler/Makefile lib/gamelib/Makefile lib/ivis_opengl/Makefile lib/netplay/Makefile lib/qtgame/Makefile lib/sdl/Makefile lib/script/Makefile lib/sequence/Makefile lib/sound/Makefile lib/widget/Makefile tools/map/Makefile src/Makefile"
>++ac_config_files="$ac_config_files Makefile po/Makefile.in doc/Makefile icons/Makefile data/Makefile data/music/Makefile pkg/nsis/Makefile win32/Makefile tests/Makefile lib/framework/Makefile lib/exceptionhandler/Makefile lib/gamelib/Makefile lib/ivis_opengl/Makefile lib/netplay/Makefile lib/qtgame/Makefile lib/sdl/Makefile lib/script/Makefile lib/sequence/Makefile lib/sound/Makefile lib/widget/Makefile tools/map/Makefile src/Makefile"
>+ 
>+ cat >confcache <<\_ACEOF
>+ # This file is a shell script that caches the results of configure
>+diff --git a/configure.ac b/configure.ac
>+index cac0b73..738d43c 100644
>+--- a/configure.ac
>++++ b/configure.ac
>+@@ -459,8 +459,6 @@ WZ_CPPFLAGS="${WZ_CPPFLAGS} -DWZ_DATADIR=\"\\\"\${datadir}/\${PACKAGE}\\\"\""
>+ WZ_CPPFLAGS="${WZ_CPPFLAGS} -DLOCALEDIR=\"\\\"\${localedir}\\\"\""
>+ WZ_CPPFLAGS="${WZ_CPPFLAGS} -I\$(top_srcdir)"
>+ 
>+-# 3rdparty libs
>+-WZ_CPPFLAGS="${WZ_CPPFLAGS} -I\$(top_srcdir)/3rdparty -I\$(top_srcdir)/3rdparty/quesoglc"
>+ 
>+ 
>+ AC_SUBST([WZ_CPPFLAGS], [${WZ_CPPFLAGS}])
>+@@ -479,8 +477,6 @@ AC_CONFIG_FILES([Makefile
>+ 		pkg/nsis/Makefile
>+ 		win32/Makefile
>+ 		tests/Makefile
>+-		3rdparty/miniupnpc/Makefile
>+-		3rdparty/quesoglc/Makefile
>+ 		lib/framework/Makefile
>+ 		lib/exceptionhandler/Makefile
>+ 		lib/gamelib/Makefile
>+diff --git a/src/Makefile.am b/src/Makefile.am
>+index cccb4a4..bc84de1 100644
>+--- a/src/Makefile.am
>++++ b/src/Makefile.am
>+@@ -277,9 +277,7 @@ COMMONLIBS = \
>+ 	$(top_builddir)/lib/ivis_opengl/libivis_opengl.a \
>+ 	$(top_builddir)/lib/gamelib/libgamelib.a \
>+ 	$(top_builddir)/lib/framework/libframework.a \
>+-	$(top_builddir)/lib/exceptionhandler/libexceptionhandler.a \
>+-	$(top_builddir)/3rdparty/miniupnpc/libminiupnpc.a \
>+-	$(top_builddir)/3rdparty/quesoglc/libquesoglc.a
>++	$(top_builddir)/lib/exceptionhandler/libexceptionhandler.a
>+ 
>+ if PORTABLE
>+ warzone2100_portable_SOURCES = $(COMMONSOURCES) $(nodist_COMMONSOURCES)
>+@@ -309,11 +307,11 @@ endif
>+ if PORTABLE
>+ warzone2100_portable_LDADD = $(warzone2100_portable_LIBS) $(LTLIBINTL) $(SDL_LIBS) $(PHYSFS_LIBS) $(PNG_LIBS) $(VORBISFILE_LIBS) $(VORBIS_LIBS) \
>+ 	$(THEORA_LIBS) $(OPENAL_LIBS) $(OPENGLC_LIBS) $(OPENGL_LIBS) $(QT4_LIBS) $(GLEW_LIBS) \
>+-	$(X_LIBS) $(X_EXTRA_LIBS) $(LIBCRYPTO_LIBS) $(LDFLAGS)
>++	$(X_LIBS) $(X_EXTRA_LIBS) $(LIBCRYPTO_LIBS) $(shell pkg-config --libs quesoglc) -lminiupnpc $(LDFLAGS)
>+ else
>+ warzone2100_LDADD = $(warzone2100_LIBS) $(LTLIBINTL) $(SDL_LIBS) $(PHYSFS_LIBS) $(PNG_LIBS) $(VORBISFILE_LIBS) $(VORBIS_LIBS) \
>+ 	$(THEORA_LIBS) $(OPENAL_LIBS) $(OPENGLC_LIBS) $(OPENGL_LIBS) $(QT4_LIBS) $(GLEW_LIBS) \
>+-	$(X_LIBS) $(X_EXTRA_LIBS) $(LDFLAGS)
>++	$(X_LIBS) $(X_EXTRA_LIBS) $(shell pkg-config --libs quesoglc) -lminiupnpc $(LDFLAGS)
>+ endif
>+ 
>+ if MINGW32
>+diff --git a/src/Makefile.in b/src/Makefile.in
>+index 9ac17b7..8c10688 100644
>+--- a/src/Makefile.in
>++++ b/src/Makefile.in
>+@@ -649,9 +649,7 @@ COMMONLIBS = \
>+ 	$(top_builddir)/lib/ivis_opengl/libivis_opengl.a \
>+ 	$(top_builddir)/lib/gamelib/libgamelib.a \
>+ 	$(top_builddir)/lib/framework/libframework.a \
>+-	$(top_builddir)/lib/exceptionhandler/libexceptionhandler.a \
>+-	$(top_builddir)/3rdparty/miniupnpc/libminiupnpc.a \
>+-	$(top_builddir)/3rdparty/quesoglc/libquesoglc.a
>++	$(top_builddir)/lib/exceptionhandler/libexceptionhandler.a
>+ 
>+ @PORTABLE_TRUE@warzone2100_portable_SOURCES = $(COMMONSOURCES) $(nodist_COMMONSOURCES)
>+ @PORTABLE_TRUE@warzone2100_portable_LIBS = $(COMMONLIBS) \
>+@@ -665,14 +663,14 @@ COMMONLIBS = \
>+ @PORTABLE_TRUE@	$(VORBISFILE_LIBS) $(VORBIS_LIBS) \
>+ @PORTABLE_TRUE@	$(THEORA_LIBS) $(OPENAL_LIBS) $(OPENGLC_LIBS) \
>+ @PORTABLE_TRUE@	$(OPENGL_LIBS) $(QT4_LIBS) $(GLEW_LIBS) \
>+-@PORTABLE_TRUE@	$(X_LIBS) $(X_EXTRA_LIBS) $(LIBCRYPTO_LIBS) \
>++@PORTABLE_TRUE@	$(X_LIBS) $(X_EXTRA_LIBS) $(shell pkg-config --libs quesoglc) -lminiupnpc $(LIBCRYPTO_LIBS) \
>+ @PORTABLE_TRUE@	$(LDFLAGS) $(am__append_5)
>+ @PORTABLE_FALSE@warzone2100_LDADD = $(warzone2100_LIBS) $(LTLIBINTL) \
>+ @PORTABLE_FALSE@	$(SDL_LIBS) $(PHYSFS_LIBS) $(PNG_LIBS) \
>+ @PORTABLE_FALSE@	$(VORBISFILE_LIBS) $(VORBIS_LIBS) \
>+ @PORTABLE_FALSE@	$(THEORA_LIBS) $(OPENAL_LIBS) $(OPENGLC_LIBS) \
>+ @PORTABLE_FALSE@	$(OPENGL_LIBS) $(QT4_LIBS) $(GLEW_LIBS) \
>+-@PORTABLE_FALSE@	$(X_LIBS) $(X_EXTRA_LIBS) $(LDFLAGS) \
>++@PORTABLE_FALSE@	$(X_LIBS) $(X_EXTRA_LIBS) $(shell pkg-config --libs quesoglc) -lminiupnpc $(LDFLAGS) \
>+ @PORTABLE_FALSE@	$(am__append_6)
>+ all: $(BUILT_SOURCES)
>+ 	$(MAKE) $(AM_MAKEFLAGS) all-am
>diff --git a/warzone2100.spec b/warzone2100.spec
>index 4c5beaa..f45e24f 100644
>--- a/warzone2100.spec
>+++ b/warzone2100.spec
>@@ -1,6 +1,6 @@
> Name:           warzone2100
> Version:        3.1.1
>-Release:        1%{?dist}
>+Release:        2%{?dist}
> Summary:        Innovative 3D real-time strategy
> 
> Group:          Amusements/Games
>@@ -8,12 +8,13 @@ License:        GPLv2+ and CC-BY-SA
> URL:            http://wz2100.net/
> Source0:        http://downloads.sourceforge.net/project/%{name}/releases/%{version}/%{name}-%{version}.tar.xz
> Source1:        http://downloads.sourceforge.net/project/%{name}/%{name}/Videos/low-quality-en/sequences.wz
>+Patch0:         %{name}-3.1.1-syslibs.patch
> 
> BuildRequires: physfs-devel >= 2.0
> BuildRequires: qt-devel >= 4.0
> BuildRequires: glew-devel >= 1.5.2
> BuildRequires: SDL_net-devel openal-soft-devel bison flex zip
>-BuildRequires: libpng-devel libogg-devel libvorbis-devel
>+BuildRequires: libpng-devel libogg-devel libvorbis-devel miniupnpc-devel
> BuildRequires: quesoglc-devel popt-devel gettext libtheora-devel
> BuildRequires: automake >= 1.8
> BuildRequires: desktop-file-utils
>@@ -37,6 +38,11 @@ Video file for %{name}
> 
> %prep
> %setup -q
>+%patch0 -p1 -b .syslibs
>+for file in $(find . -name "*.syslibs"); do
>+    touch -r $file $(basename -s .syslibs $file)
>+done
>+rm -r 3rdparty
> 
> %build
> %configure --disable-rpath --enable-debug=no --with-distributor="Fedora"
>@@ -64,6 +70,9 @@ install -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{name}/
> %{_datadir}/%{name}/sequences.wz
> 
> %changelog
>+* Tue Mar 18 2014 Ville SkyttÃ¤ <ville.skytta@iki.fi> - 3.1.1-2
>+- Build with system quesoglc and miniupnpc instead of bundled ones
>+
> * Thu Dec 12 2013 Jan SynÃ¡Äek <jsynacek@redhat.com> - 3.1.1-1
> - Update to 3.1.1 (#1040915)
> 
>-- 
>1.8.3.1

Actions: View | Diff

Attachments on bug 1077861: 876047