Date: Tuesday, February 25, 2014 @ 22:55:11
Author: svenstaro
Revision: 106254
archrelease: copy trunk to community-any
Added:
widelands-data/repos/community-any/PKGBUILD
(from rev 106253, widelands-data/trunk/PKGBUILD)
widelands-data/repos/community-any/widelands-0.16-libpng15.patch
(from rev 106253, widelands-data/trunk/widelands-0.16-libpng15.patch)
Deleted:
widelands-data/repos/community-any/PKGBUILD
widelands-data/repos/community-any/widelands-0.16-libpng15.patch
-------------------------------+
PKGBUILD | 76 ++++++++++++------------
widelands-0.16-libpng15.patch | 122 ++++++++++++++++++++--------------------
2 files changed, 98 insertions(+), 100 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2014-02-25 21:55:01 UTC (rev 106253)
+++ PKGBUILD 2014-02-25 21:55:11 UTC (rev 106254)
@@ -1,39 +0,0 @@
-# $Id$
-# Maintainer: Sven-Hendrik Haase <[email protected]>
-# Contributor: Arkham <arkham at archlinux dot us>
-# Contributor: Christoph Zeiler <rabyte*gmail>
-
-pkgname=widelands-data
-pkgver=17
-_realver=build17
-pkgrel=1
-pkgdesc="Widelands data files"
-arch=('any')
-url="http://widelands.org/";
-license=('GPL')
-makedepends=('cmake' 'boost' 'sdl_mixer' 'sdl_image' 'sdl_net' 'sdl_ttf'
'sdl_gfx' 'ggz-client-libs' 'lua' 'glew' 'python2')
-source=(http://launchpad.net/widelands/build16/$_realver/+download/widelands-$_realver-src.tar.bz2)
-md5sums=('bdc9bc0aa631af1aa7fb450507611a58')
-
-build() {
- cd $srcdir/widelands-$_realver-src
-
- sed -i "1 i #include <unistd.h>" src/main.cc
-
- mkdir -p build/compile && cd build/compile
-
- cmake ../.. -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DWL_INSTALL_PREFIX=/usr \
- -DWL_INSTALL_DATADIR=share/widelands \
- -DWL_INSTALL_BINDIR=bin
- make
-}
-
-package() {
- cd $srcdir/widelands-$_realver-src/build/compile
-
- make DESTDIR="$pkgdir" install
-
- rm -r
"$pkgdir"/usr/{bin,share/widelands/{ChangeLog,COPYING,CREDITS,VERSION}}
-}
Copied: widelands-data/repos/community-any/PKGBUILD (from rev 106253,
widelands-data/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2014-02-25 21:55:11 UTC (rev 106254)
@@ -0,0 +1,37 @@
+# $Id$
+# Maintainer: Sven-Hendrik Haase <[email protected]>
+# Contributor: Arkham <arkham at archlinux dot us>
+# Contributor: Christoph Zeiler <rabyte*gmail>
+
+pkgname=widelands-data
+pkgver=18
+_realver=build18
+pkgrel=1
+pkgdesc="Widelands data files"
+arch=('any')
+url="http://widelands.org/";
+license=('GPL')
+makedepends=('cmake' 'boost' 'sdl_mixer' 'sdl_image' 'sdl_net' 'sdl_ttf'
'sdl_gfx' 'lua51' 'glew' 'python2')
+source=("http://launchpad.net/widelands/${_realver}/build-${pkgver}/+download/widelands-$_realver-src.tar.bz2";)
+md5sums=('01efe8db8cd25ffeb4f82b8b4ab6652e')
+
+build() {
+ cd $srcdir/widelands-$_realver-src
+
+ mkdir -p build/compile && cd build/compile
+
+ cmake ../.. -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DWL_INSTALL_PREFIX=/usr \
+ -DWL_INSTALL_DATADIR=share/widelands \
+ -DWL_INSTALL_BINDIR=bin
+ make
+}
+
+package() {
+ cd $srcdir/widelands-$_realver-src/build/compile
+
+ make DESTDIR="$pkgdir" install
+
+ rm -r
"$pkgdir"/usr/{bin,share/widelands/{ChangeLog,COPYING,CREDITS,VERSION}}
+}
Deleted: widelands-0.16-libpng15.patch
===================================================================
--- widelands-0.16-libpng15.patch 2014-02-25 21:55:01 UTC (rev 106253)
+++ widelands-0.16-libpng15.patch 2014-02-25 21:55:11 UTC (rev 106254)
@@ -1,61 +0,0 @@
---- src/graphic/SDL_mng.cc
-+++ src/graphic/SDL_mng.cc
-@@ -276,7 +276,7 @@
- * the normal method of doing things with libpng). REQUIRED unless you
- * set up your own error handlers in png_create_read_struct() earlier.
- */
-- if (setjmp(png_ptr->jmpbuf)) {
-+ if (setjmp(png_jmpbuf(png_ptr))) {
- SDL_SetError("Error reading the PNG file.");
- goto done;
- }
-@@ -356,9 +356,9 @@
- Rmask = 0x000000FF;
- Gmask = 0x0000FF00;
- Bmask = 0x00FF0000;
-- Amask = (info_ptr->channels == 4) ? 0xFF000000 : 0;
-+ Amask = (png_get_channels(png_ptr, info_ptr) == 4) ?
0xFF000000 : 0;
- } else {
-- int const s = (info_ptr->channels == 4) ? 0 : 8;
-+ int const s = (png_get_channels(png_ptr, info_ptr) ==
4) ? 0 : 8;
- Rmask = 0xFF000000 >> s;
- Gmask = 0x00FF0000 >> s;
- Bmask = 0x0000FF00 >> s;
-@@ -369,7 +369,7 @@
- SDL_AllocSurface
- (SDL_SWSURFACE,
- width, height,
-- bit_depth * info_ptr->channels,
-+ bit_depth * png_get_channels(png_ptr, info_ptr),
- Rmask, Gmask, Bmask, Amask);
- if (not surface) {
- SDL_SetError("Out of memory");
-@@ -407,6 +407,9 @@
- /* read rest of file, get additional chunks in info_ptr - REQUIRED */
- png_read_end(png_ptr, info_ptr);
-
-+ png_colorp png_palette;
-+ int png_num_palette;
-+
- /* Load the palette, if any */
- if ((palette = surface->format->palette)) {
- if (color_type == PNG_COLOR_TYPE_GRAY) {
-@@ -416,12 +419,12 @@
- palette->colors[i].g = i;
- palette->colors[i].b = i;
- }
-- } else if (info_ptr->num_palette > 0) {
-- palette->ncolors = info_ptr->num_palette;
-- for (uint32_t i = 0; i < info_ptr->num_palette; ++i) {
-- palette->colors[i].b =
info_ptr->palette[i].blue;
-- palette->colors[i].g =
info_ptr->palette[i].green;
-- palette->colors[i].r = info_ptr->palette[i].red;
-+ } else if (png_num_palette > 0) {
-+ palette->ncolors = png_num_palette;
-+ for (uint32_t i = 0; i < png_num_palette; ++i) {
-+ palette->colors[i].b = png_palette[i].blue;
-+ palette->colors[i].g = png_palette[i].green;
-+ palette->colors[i].r = png_palette[i].red;
- }
- }
- }
Copied: widelands-data/repos/community-any/widelands-0.16-libpng15.patch (from
rev 106253, widelands-data/trunk/widelands-0.16-libpng15.patch)
===================================================================
--- widelands-0.16-libpng15.patch (rev 0)
+++ widelands-0.16-libpng15.patch 2014-02-25 21:55:11 UTC (rev 106254)
@@ -0,0 +1,61 @@
+--- src/graphic/SDL_mng.cc
++++ src/graphic/SDL_mng.cc
+@@ -276,7 +276,7 @@
+ * the normal method of doing things with libpng). REQUIRED unless you
+ * set up your own error handlers in png_create_read_struct() earlier.
+ */
+- if (setjmp(png_ptr->jmpbuf)) {
++ if (setjmp(png_jmpbuf(png_ptr))) {
+ SDL_SetError("Error reading the PNG file.");
+ goto done;
+ }
+@@ -356,9 +356,9 @@
+ Rmask = 0x000000FF;
+ Gmask = 0x0000FF00;
+ Bmask = 0x00FF0000;
+- Amask = (info_ptr->channels == 4) ? 0xFF000000 : 0;
++ Amask = (png_get_channels(png_ptr, info_ptr) == 4) ?
0xFF000000 : 0;
+ } else {
+- int const s = (info_ptr->channels == 4) ? 0 : 8;
++ int const s = (png_get_channels(png_ptr, info_ptr) ==
4) ? 0 : 8;
+ Rmask = 0xFF000000 >> s;
+ Gmask = 0x00FF0000 >> s;
+ Bmask = 0x0000FF00 >> s;
+@@ -369,7 +369,7 @@
+ SDL_AllocSurface
+ (SDL_SWSURFACE,
+ width, height,
+- bit_depth * info_ptr->channels,
++ bit_depth * png_get_channels(png_ptr, info_ptr),
+ Rmask, Gmask, Bmask, Amask);
+ if (not surface) {
+ SDL_SetError("Out of memory");
+@@ -407,6 +407,9 @@
+ /* read rest of file, get additional chunks in info_ptr - REQUIRED */
+ png_read_end(png_ptr, info_ptr);
+
++ png_colorp png_palette;
++ int png_num_palette;
++
+ /* Load the palette, if any */
+ if ((palette = surface->format->palette)) {
+ if (color_type == PNG_COLOR_TYPE_GRAY) {
+@@ -416,12 +419,12 @@
+ palette->colors[i].g = i;
+ palette->colors[i].b = i;
+ }
+- } else if (info_ptr->num_palette > 0) {
+- palette->ncolors = info_ptr->num_palette;
+- for (uint32_t i = 0; i < info_ptr->num_palette; ++i) {
+- palette->colors[i].b =
info_ptr->palette[i].blue;
+- palette->colors[i].g =
info_ptr->palette[i].green;
+- palette->colors[i].r = info_ptr->palette[i].red;
++ } else if (png_num_palette > 0) {
++ palette->ncolors = png_num_palette;
++ for (uint32_t i = 0; i < png_num_palette; ++i) {
++ palette->colors[i].b = png_palette[i].blue;
++ palette->colors[i].g = png_palette[i].green;
++ palette->colors[i].r = png_palette[i].red;
+ }
+ }
+ }
