From b23dd675d618569842e4405c5652fd6b1c84b751 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Jan 27 2012 16:44:02 +0000 Subject: New upstream release 0.8.2 (rhbz#784831) --- diff --git a/.gitignore b/.gitignore index 83720de..7c58827 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ openmsx-0.7.2.tar.gz /openmsx-0.8.1.tar.gz +/openmsx-0.8.2.tar.gz diff --git a/openmsx-0.8.1-libpng15.patch b/openmsx-0.8.1-libpng15.patch deleted file mode 100644 index 46d4eb4..0000000 --- a/openmsx-0.8.1-libpng15.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up openmsx-0.8.1/src/video/PNG.cc~ openmsx-0.8.1/src/video/PNG.cc ---- openmsx-0.8.1/src/video/PNG.cc~ 2011-03-12 21:41:38.000000000 +0100 -+++ openmsx-0.8.1/src/video/PNG.cc 2011-12-06 15:16:12.331323816 +0100 -@@ -167,7 +167,7 @@ SDLSurfacePtr load(const std::string& fi - "Attempted to create a surface with excessive height: " - << height << ", max " << MAX_SIZE); - } -- int bpp = png.info->channels * 8; -+ int bpp = png_get_channels(png.ptr, png.info) * 8; - assert(bpp == 24 || bpp == 32); - Uint32 redMask, grnMask, bluMask, alpMask; - if (OPENMSX_BIGENDIAN) { diff --git a/openmsx.spec b/openmsx.spec index 08e95e2..af241c7 100644 --- a/openmsx.spec +++ b/openmsx.spec @@ -1,13 +1,12 @@ Name: openmsx -Version: 0.8.1 -Release: 2%{?dist} +Version: 0.8.2 +Release: 1%{?dist} Summary: An emulator for the MSX home computer system Group: Applications/Emulators License: GPL+ URL: http://openmsx.sourceforge.net Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Patch0: openmsx-0.6.1-installbase.patch -Patch1: openmsx-0.8.1-libpng15.patch BuildRequires: desktop-file-utils BuildRequires: docbook-utils BuildRequires: glew-devel >= 1.3.2 @@ -28,7 +27,6 @@ all aspects of the MSX with 100% accuracy. %prep %setup -q %patch0 -p1 -%patch1 -p1 # Verbose compilation sed -i 's/@$(COMPILE_ENV)/$(COMPILE_ENV)/' build/main.mk @@ -54,10 +52,6 @@ echo 'System ROM Dir: %{_datadir}/%{name}/systemroms' > doc/systemroms-README cat share/systemroms/README >> doc/systemroms-README touch -r share/systemroms/README doc/systemroms-README -echo '%{_datadir}/%{name}/machines/Boosted_MSX2_EN/roms' > doc/Boosted_MSX2_EN-roms-README -cat share/machines/Boosted_MSX2_EN/roms/README >> doc/Boosted_MSX2_EN-roms-README -touch -r share/machines/Boosted_MSX2_EN/roms/README doc/Boosted_MSX2_EN-roms-README - echo '%{_datadir}/%{name}/machines/Boosted_MSX2_EN' > doc/Boosted_MSX2_EN-README cat share/machines/Boosted_MSX2_EN/README >> doc/Boosted_MSX2_EN-README touch -r share/machines/Boosted_MSX2_EN/README doc/Boosted_MSX2_EN-README @@ -146,6 +140,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Fri Jan 27 2012 Hans de Goede - 0.8.2-1 +- New upstream release 0.8.2 (rhbz#784831) + * Fri Jan 13 2012 Fedora Release Engineering - 0.8.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild diff --git a/sources b/sources index 5078b08..d0f24c6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fb150cbe90ab9809545f87464ee25216 openmsx-0.8.1.tar.gz +42bceabdd89a4986e745f74ac44da631 openmsx-0.8.2.tar.gz