Hello community, here is the log from the commit of package pingus for openSUSE:Factory checked in at 2012-01-30 12:27:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pingus (Old) and /work/SRC/openSUSE:Factory/.pingus.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pingus", Maintainer is "prus...@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/pingus/pingus.changes 2011-09-23 12:41:10.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.pingus.new/pingus.changes 2012-01-30 12:27:57.000000000 +0100 @@ -1,0 +2,57 @@ +Thu Jan 26 09:00:00 MST 2012 - db...@novell.com + +- Update to 0.7.6 + * added new SVG icons for Pingus + * added 10 new xmas themed levels + * added ability to sort levelsets by priority + +------------------------------------------------------------------- +Wed Nov 9 11:01:52 UTC 2011 - sasc...@suse.de + +- Spec file cleanup: + * run spec-cleaner + * run fdupes + * fix executable bits for stuff in /usr/share/pingus + +------------------------------------------------------------------- +Wed Nov 03 01:00:00 MST 2011 - db...@novell.com + +- update to 0.7.5 + * fixed memory leak in OpenGL renderer + * added support for Win32 cross-compilation with mingw32 + * added gamespeed adjustments via KPPlus, KPMinus, KPEnter + * added single-stepping the game with 'S' + * added better application icon + * added access to all levelsets in developer-mode (Ctrl-m) + * added 10 new Halloween levels + +------------------------------------------------------------------- +Wed Oct 12 01:00:00 MST 2011 - db...@novell.com + +- update to 0.7.4 + * fixed game not starting when no soundcard is present + * all halloween and tutorial levels have been converted to a minimum size of 1920x1200 so they can be played in fullscreen without letterboxing + * new --userdir command line switch to set the directory where savegames are saved + * menu getting confused by fast succedding clicks fixed + * level-demo recording and playback are back (files not compatible between x86 and x86-64) + * window resize support throughout the whole game + * dirty-rectangles drawing for improved performance with software rendering + * OpenGL rendering + * new blackboard graphic + * Unicode support + * two new levelsets, "Desert" and "Factory Campaign", with 27 new levels + * added a man-page + * deadly fall height has been increased + * support for prefab objects and groups in the editor + * cleaned up digger, miner and basher paths + * added an option menu + * lots of minor bug fixes + * bitmap fonts have been generated with anti-aliasing +- update patch set + * removed gcc46.patch (included in update) + * added makefile-fixes.patch and remove-debug_fix-includes.patch + * updated dsolink.patch and pingus-cwiid_with_bluez.patch +- clean SPEC a bit + + +------------------------------------------------------------------- Old: ---- gcc46.patch pingus-0.7.3.tar.bz2 New: ---- makefile-fixes.patch pingus-0.7.6.tar.bz2 remove-debug_fix-includes.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pingus.spec ++++++ --- /var/tmp/diff_new_pack.RitK52/_old 2012-01-30 12:27:58.000000000 +0100 +++ /var/tmp/diff_new_pack.RitK52/_new 2012-01-30 12:27:58.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package pingus # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,26 +15,35 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: pingus -BuildRequires: coreutils gcc-c++ scons update-desktop-files -BuildRequires: SDL_image-devel SDL_mixer-devel boost-devel libpng-devel -BuildRequires: bluez-devel libcwiid-devel -License: GPLv2+ +Version: 0.7.6 +Release: 0 +Summary: A Lemmings Clone +License: GPL-3.0+ Group: Amusements/Games/Action/Arcade Url: http://pingus.seul.org/ -AutoReqProv: on -Version: 0.7.3 -Release: 5 -Summary: A Lemmings Clone Source: http://pingus.seul.org/files/pingus-%{version}.tar.bz2 Source2: %{name}.desktop Source3: %{name}.png +# PATCH-FEATURE-OPENSUSE pingus-cwiid_with_bluez.patch pascal.ble...@opensuse.org -- adds wii support Patch1: pingus-cwiid_with_bluez.patch -Patch2: gcc46.patch -Patch3: dsolink.patch +# PATCH-FIX-UPSTREAM dsolink.patch -- Fix linking against X11 +Patch2: dsolink.patch +# PATCH-FIX-UPSTREAM remove-debug_fix-includes.patch db...@novell.com -- allow wii support to compile +Patch3: remove-debug_fix-includes.patch +# PATCH-FIX-OPENSUSE makefile-fixes.patch db...@novell.com -- use /usr for prefix +Patch4: makefile-fixes.patch +BuildRequires: SDL_image-devel +BuildRequires: SDL_mixer-devel +BuildRequires: bluez-devel +BuildRequires: boost-devel +BuildRequires: fdupes +BuildRequires: gcc-c++ +BuildRequires: libcwiid-devel +BuildRequires: libpng-devel +BuildRequires: scons +BuildRequires: update-desktop-files BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -46,32 +55,26 @@ %setup -q %patch1 %patch2 -%patch3 -p1 +%patch3 +%patch4 %build -CFLAGS="${RPM_OPT_FLAGS/-D_FORTIFY_SOURCE=2/-D_FORTIFY_SOURCE=1}" -CFLAGS="${CFLAGS/-O2/-O}" -sed -i "s/-O2 -Wall/$CFLAGS/" src/Makefile.static -scons configure CCFLAGS="$CFLAGS" with_wiimote=True with_linuxusbmouse=True with_linuxevdev=True with_xinput=True -scons -j4 +mkdir -p build +scons %{?_smp_mflags} CCFLAGS="%{optflags}" with_wiimote=True with_linuxusbmouse=True with_linuxevdev=True with_xinput=True %install -./install.sh $RPM_BUILD_ROOT%{_prefix} -#chmod -x $RPM_BUILD_ROOT%{_datadir}/pingus/data/gen-scrfile.scm -mv $RPM_BUILD_ROOT%{_prefix}/{bin,games} -mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps/ -install -m 644 $RPM_SOURCE_DIR/%{name}.png $RPM_BUILD_ROOT%{_datadir}/pixmaps -install -m 644 -D doc/pingus.6 $RPM_BUILD_ROOT%{_mandir}/man6/pingus.6 +%make_install +mkdir -p %{buildroot}%{_datadir}/pixmaps/ +install -m 644 %{SOURCE3} %{buildroot}%{_datadir}/pixmaps %suse_update_desktop_file -i %{name} Game ArcadeGame - -%clean -%{?buildroot:%__rm -rf "%{buildroot}"} +%fdupes -s %{buildroot}%{_datadir} %files %defattr(-,root,root) %doc AUTHORS COPYING NEWS README TODO -%doc %{_mandir}/man6/pingus.6.gz -%{_prefix}/games/pingus +%doc %{_mandir}/man1/pingus.6.gz +%{_bindir}/pingus +%{_bindir}/pingus.bin %{_datadir}/pingus %{_datadir}/applications/%{name}.desktop %{_datadir}/pixmaps/%{name}.png ++++++ dsolink.patch ++++++ --- /var/tmp/diff_new_pack.RitK52/_old 2012-01-30 12:27:58.000000000 +0100 +++ /var/tmp/diff_new_pack.RitK52/_new 2012-01-30 12:27:58.000000000 +0100 @@ -1,7 +1,5 @@ -Index: pingus-0.7.3/src/input/SConstruct.main -=================================================================== ---- pingus-0.7.3.orig/src/input/SConstruct.main -+++ pingus-0.7.3/src/input/SConstruct.main +--- src/engine/input/SConstruct.main.orig ++++ src/engine/input/SConstruct.main @@ -6,7 +6,7 @@ env = Environment(CCFLAGS = ['-O0', '-W LIBS = ['cwiid']) @@ -11,16 +9,14 @@ env.Program('main', [ 'main.cpp', -Index: pingus-0.7.3/SConstruct -=================================================================== ---- pingus-0.7.3.orig/SConstruct -+++ pingus-0.7.3/SConstruct -@@ -469,7 +469,7 @@ if ('configure' in COMMAND_LINE_TARGETS) - else: - reports += " * XInput support: yes\n" - config_h_defines += [('HAVE_XINPUT', 1)] -- env['LIBS'] += ['Xi'] -+ env['LIBS'] += ['Xi','X11'] - env['optional_sources'] += ['src/input/xinput_driver.cpp', - 'src/input/xinput_device.cpp'] - +--- SConscript.orig 2011-10-11 23:18:56.277252851 -0600 ++++ SConscript 2011-10-11 23:19:52.612706510 -0600 +@@ -187,7 +187,7 @@ class Project: + else: + self.reports += " * XInput support: yes\n" + self.conf.env.Append(CPPDEFINES = [('HAVE_XINPUT', 1)]) +- self.conf.env.Append(LIBS = ['Xi']) ++ self.conf.env.Append(LIBS = ['Xi','X11']) + self.conf.env.Append(optional_sources = ['src/engine/input/xinput/xinput_driver.cpp', + 'src/engine/input/xinput/xinput_device.cpp']) + ++++++ makefile-fixes.patch ++++++ --- Makefile.orig 2011-10-12 00:18:03.626499086 -0600 +++ Makefile 2011-10-12 00:52:52.658615367 -0600 @@ -15,7 +15,7 @@ ## along with this program. If not, see <http://www.gnu.org/licenses/>. DESTDIR = -PREFIX = /usr/local +PREFIX = /usr DATADIR = $(PREFIX)/share/pingus MANDIR = $(PREFIX)/share/man BINDIR = $(PREFIX)/bin @@ -66,7 +66,7 @@ install-data: \) -exec install -D {} $(DESTDIR)$(DATADIR)/{} \; install-man: - install -D doc/man/pingus.6 "$(DESTDIR)$(MANDIR)/man1/pingus.6" + install -m 644 -D doc/man/pingus.6 "$(DESTDIR)$(MANDIR)/man1/pingus.6" .PHONY : clean install install-exec install-data install-man ++++++ pingus-0.7.3.tar.bz2 -> pingus-0.7.6.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/pingus/pingus-0.7.3.tar.bz2 /work/SRC/openSUSE:Factory/.pingus.new/pingus-0.7.6.tar.bz2 differ: char 11, line 1 ++++++ pingus-cwiid_with_bluez.patch ++++++ --- /var/tmp/diff_new_pack.RitK52/_old 2012-01-30 12:27:58.000000000 +0100 +++ /var/tmp/diff_new_pack.RitK52/_new 2012-01-30 12:27:58.000000000 +0100 @@ -1,19 +1,19 @@ ---- SConstruct.orig 2010-07-31 13:17:40.000000000 +0200 -+++ SConstruct 2010-07-31 15:46:45.000000000 +0200 -@@ -455,14 +455,12 @@ - - if not env['with_wiimote']: - reports += " * Wiimote support: disabled\n" -- elif config.CheckLibWithHeader('cwiid', 'cwiid.h', 'c++'): -+ else: - reports += " * Wiimote support: yes\n" - config_h_defines += [('HAVE_CWIID', 1)] -- env['LIBS'] += ['cwiid'] -+ env['LIBS'] += ['cwiid', 'bluetooth', 'pthread', 'rt'] - env['optional_sources'] += ['src/input/wiimote_driver.cpp', - 'src/input/wiimote.cpp'] -- else: -- reports += " * Wiimote support: no (libcwiid or cwiid.h not found)\n" - - if not env['with_xinput']: - reports += " * XInput support: disabled\n" +--- SConscript.orig 2011-10-11 23:06:19.189087994 -0600 ++++ SConscript 2011-10-11 23:06:31.193752354 -0600 +@@ -170,14 +170,12 @@ class Project: + def configure_wiimote(self): + if not self.env['with_wiimote']: + self.reports += " * Wiimote support: disabled\n" +- elif self.conf.CheckLibWithHeader('cwiid', 'cwiid.h', 'c++'): ++ else: + self.reports += " * Wiimote support: yes\n" + self.conf.env.Append(CPPDEFINES = [('HAVE_CWIID', 1)]) +- self.conf.env.Append(LIBS = ['cwiid']) ++ self.conf.env.Append(LIBS = ['cwiid', 'bluetooth', 'pthread', 'rt']) + self.conf.env.Append(optional_sources = ['src/engine/input/wiimote/wiimote_driver.cpp', + 'src/engine/input/wiimote/wiimote.cpp']) +- else: +- self.reports += " * Wiimote support: no (libcwiid or cwiid.h not found)\n" + + def configure_xinput(self): + if not self.env['with_xinput']: ++++++ remove-debug_fix-includes.patch ++++++ --- src/engine/input/xinput/xinput_driver.cpp.orig 2011-10-11 23:47:16.738519656 -0600 +++ src/engine/input/xinput/xinput_driver.cpp 2011-10-11 23:48:46.928047145 -0600 @@ -17,8 +17,8 @@ #include "engine/input/xinput/xinput_driver.hpp" #include "engine/input/xinput/xinput_device.hpp" -#include "pingus/debug.hpp" #include "pingus/globals.hpp" +#include <iostream> namespace Input { @@ -67,7 +67,6 @@ XInputDriver::setup_xinput() XDeviceInfo* info = XListInputDevices(sys.info.x11.display, &num_devices); for(int i = 0; i < num_devices; ++i) { - pout(PINGUS_DEBUG_INPUT) << "XInputDriver: Device name='" << info[i].name << "'" << std::endl; // FIXME: Xinput isn't necesarrily a mouse, could be anything //if (info[i].use == IsXExtensionDevice) // { --- src/engine/input/xinput/xinput_device.cpp.orig 2011-10-11 23:49:17.767206126 -0600 +++ src/engine/input/xinput/xinput_device.cpp 2011-10-11 23:49:17.781205782 -0600 @@ -17,6 +17,7 @@ #include "engine/input/xinput/xinput_device.hpp" #include "engine/input/xinput/xinput_driver.hpp" +#include <iostream> namespace Input { --- src/engine/input/wiimote/wiimote_driver.cpp.orig 2011-10-11 23:47:00.482967560 -0600 +++ src/engine/input/wiimote/wiimote_driver.cpp 2011-10-12 00:01:18.199706428 -0600 @@ -17,9 +17,9 @@ #include "engine/input/wiimote/wiimote_driver.hpp" #include "engine/input/wiimote/wiimote.hpp" -#include "pingus/debug.hpp" #include "pingus/globals.hpp" #include "util/string_util.hpp" +#include <iostream> namespace Input { @@ -48,10 +48,6 @@ WiimoteDriver::update(float delta) WiimoteEvent& event = *i; if (event.type == WiimoteEvent::WIIMOTE_BUTTON_EVENT) { - pout(PINGUS_DEBUG_INPUT) << "WiimoteDriver: (wiimote:button (button " - << event.button.button << ")) => " - << event.button.down << std::endl; - for (std::vector<ButtonBinding>::const_iterator j = button_bindings.begin(); j != button_bindings.end(); ++j) @@ -64,11 +60,6 @@ WiimoteDriver::update(float delta) } else if (event.type == WiimoteEvent::WIIMOTE_AXIS_EVENT) { - pout(PINGUS_DEBUG_INPUT) << "WiimoteDriver: (wiimote:axis (axis " - << event.axis.axis << ")) => " - << event.axis.pos - << std::endl; // Fixme: should output string - for (std::vector<AxisBinding>::const_iterator j = axis_bindings.begin(); j != axis_bindings.end(); ++j) { -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
