Hello community, here is the log from the commit of package pink-pony for openSUSE:Factory checked in at 2015-03-28 18:38:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pink-pony (Old) and /work/SRC/openSUSE:Factory/.pink-pony.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pink-pony" Changes: -------- --- /work/SRC/openSUSE:Factory/pink-pony/pink-pony.changes 2013-12-19 12:25:39.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.pink-pony.new/pink-pony.changes 2015-03-28 18:38:32.000000000 +0100 @@ -1,0 +2,14 @@ +Thu Mar 12 11:50:00 UTC 2015 - [email protected] + +- go back to using libglfw2 +- fix download url +- use %optflags (pink-pony-1.4.1.diff) + +------------------------------------------------------------------- +Tue Jan 27 12:04:11 UTC 2015 - [email protected] + +- new version 1.4.1 + * mainly build changes + * remove obsolete (pink-pony-glx.diff) + +------------------------------------------------------------------- Old: ---- pink-pony-1.3.1.tar.bz2 pink-pony-glx.diff New: ---- pink-pony-1.4.1.diff pink-pony-1.4.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pink-pony.spec ++++++ --- /var/tmp/diff_new_pack.QXMnpQ/_old 2015-03-28 18:38:33.000000000 +0100 +++ /var/tmp/diff_new_pack.QXMnpQ/_new 2015-03-28 18:38:33.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package pink-pony # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,16 +17,16 @@ Name: pink-pony -Version: 1.3.1 +Version: 1.4.1 Release: 0 Summary: 3D racing game with ponies License: GPL-3.0+ Group: Amusements/Games/Action/Arcade Url: http://code.google.com/p/pink-pony/ -Source0: http://pink-pony.googlecode.com/files/pink-pony-%{version}.tar.bz2 +Source0: http://pink-pony.googlecode.com/files/pink-pony-%{version}.tar.gz Patch0: datadir.patch Patch1: script.patch -Patch2: pink-pony-glx.diff +Patch2: pink-pony-1.4.1.diff BuildRequires: DevIL-devel BuildRequires: SDL-devel @@ -34,10 +34,10 @@ BuildRequires: desktop-file-utils BuildRequires: ftgl-devel BuildRequires: ilmbase-devel -BuildRequires: libglfw-devel BuildRequires: libsigc++2-devel BuildRequires: protobuf-devel BuildRequires: scons +BuildRequires: pkgconfig(libglfw) Requires: pink-pony-data = %version @@ -67,10 +67,9 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 -sed -i 's/-O3/%optflags/' SConstruct %build -protoc mesh.proto --cpp_out=lib/ +export CCFLAGS="%optflags" scons -f SConstruct %{?_smp_mflags} \ prefix=/usr \ resources_dir=/usr/share/pink-pony \ ++++++ datadir.patch ++++++ --- /var/tmp/diff_new_pack.QXMnpQ/_old 2015-03-28 18:38:33.000000000 +0100 +++ /var/tmp/diff_new_pack.QXMnpQ/_new 2015-03-28 18:38:33.000000000 +0100 @@ -1,11 +1,11 @@ # Copyright (C) 2009 Miriam Ruiz <[email protected]> # Distributed under the same license as the game (GPL3+). See debian/copyright -Index: pink-pony-1.3.1/pony.options +Index: pink-pony-1.4.1/pony.options =================================================================== ---- pink-pony-1.3.1.orig/pony.options 2013-09-13 00:55:46.000000000 +0200 -+++ pink-pony-1.3.1/pony.options 2013-09-13 00:55:46.000000000 +0200 -@@ -9,7 +9,7 @@ +--- pink-pony-1.4.1.orig/pony.options ++++ pink-pony-1.4.1/pony.options +@@ -9,7 +9,7 @@ polygon_mode = fill; // Resource directory @@ -14,11 +14,11 @@ // Particles -Index: pink-pony-1.3.1/Pony.cc +Index: pink-pony-1.4.1/src/main.cc =================================================================== ---- pink-pony-1.3.1.orig/Pony.cc 2013-09-13 00:55:46.000000000 +0200 -+++ pink-pony-1.3.1/Pony.cc 2013-09-13 00:55:46.000000000 +0200 -@@ -18,7 +18,7 @@ +--- pink-pony-1.4.1.orig/src/main.cc ++++ pink-pony-1.4.1/src/main.cc +@@ -20,7 +20,7 @@ Config config; int main(int argc, char** argv) { @@ -26,4 +26,4 @@ + string config_file = "/usr/share/pink-pony/pony.options"; bool running = true; - Config config; + if (argc > 1) { ++++++ pink-pony-glx.diff -> pink-pony-1.4.1.diff ++++++ --- /work/SRC/openSUSE:Factory/pink-pony/pink-pony-glx.diff 2013-12-19 12:25:39.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.pink-pony.new/pink-pony-1.4.1.diff 2015-03-28 18:38:31.000000000 +0100 @@ -1,16 +1,16 @@ -new Mesa removed GLXContextID from glx.h so it's missing here - -https://www.mail-archive.com/[email protected]/msg43825.html - -Index: pink-pony-1.3.1/lib/GL/GLee.h +Index: pink-pony-1.4.1/SConstruct =================================================================== ---- pink-pony-1.3.1.orig/lib/GL/GLee.h -+++ pink-pony-1.3.1/lib/GL/GLee.h -@@ -64,6 +64,7 @@ - #define GLX_GLXEXT_PROTOTYPES - #include <GL/gl.h> - #include <GL/glx.h> -+ typedef XID GLXContextID; - #endif - - #ifndef APIENTRY +--- pink-pony-1.4.1.orig/SConstruct ++++ pink-pony-1.4.1/SConstruct +@@ -5,7 +5,10 @@ optimization_flags = ['-O3'] + + env = Environment() + env['CC'] = 'g++' +-env['CCFLAGS'] = ['-Wall', '-Wextra', '-Wno-reorder', '-Wno-unused-parameter'] + optimization_flags ++if 'CCFLAGS' in os.environ: ++ env['CCFLAGS'] = os.environ['CCFLAGS'] ++else: ++ env['CCFLAGS'] = ['-Wall', '-Wextra', '-Wno-reorder', '-Wno-unused-parameter'] + optimization_flags + env['LIBS'] = ['GLU', 'GL', 'protobuf', 'IL'] + env['CPPPATH'] = ['#', '#/src', '#/external/tinyXML', '#/external/flextGL/', '/usr/include/OpenEXR'] + -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
