diff options
Diffstat (limited to 'community/paintown')
| -rw-r--r-- | community/paintown/PKGBUILD | 54 | ||||
| -rw-r--r-- | community/paintown/libpng15.patch | 343 | ||||
| -rw-r--r-- | community/paintown/paintown.png | bin | 14271 -> 0 bytes |
3 files changed, 0 insertions, 397 deletions
diff --git a/community/paintown/PKGBUILD b/community/paintown/PKGBUILD deleted file mode 100644 index 8fe359267..000000000 --- a/community/paintown/PKGBUILD +++ /dev/null @@ -1,54 +0,0 @@ -# $Id: PKGBUILD 75859 2012-09-03 17:14:58Z svenstaro $ -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> -# Contributor: Jschares <jacob.schares@gmail.com> -# Contributor: celmir <scibecelmir@tuxfamily.org> -# Contributor: Feufochmar <guill.delacourt@gmail.com> - -pkgname=paintown -pkgver=3.6.0 -pkgrel=1 -pkgdesc="Open source fighting game in the same genre as Streets of Rage and Teenage Mutant Ninja Turtles" -arch=('i686' 'x86_64') -url="http://paintown.sourceforge.net/" -license=('GPL') -depends=('python2' 'freetype2' 'sdl' 'libpng' 'mpg123' 'libogg' 'libvorbis') -makedepends=('cmake' 'gendesk') -#install=paintown.install -source=(http://downloads.sourceforge.net/sourceforge/paintown/$pkgname-$pkgver.tar.bz2 - paintown.png) -md5sums=('5c1160bee51fe2011a1141c490a5d368' - 'ed547f1377212ea079cf9b0a1ad2d587') - -build() { - cd "$srcdir" - gendesk - - cd "$pkgname-$pkgver" - - # fix python2 header - for file in $(find . -name '*.py' -print); do - sed -i "s#/usr/bin/python#/usr/bin/env python2#" $file - done - - #sed -i "1 i #include <zlib.h>" src/util/sdl/image/IMG_png.c - #sed -i "1 i #include <zlib.h>" src/util/sdl/image/IMG_savepng.c - - mkdir -p build && cd build - cmake .. - make - cp bin/paintown .. -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - mkdir -p $pkgdir/usr/{bin,share/{paintown,pixmaps,applications,licenses/paintown}} - sh install.sh -d $pkgdir/usr/share/paintown -b $pkgdir/usr/bin - # correct the gnerated file to remove the wrong path (because $pkgdir/usr/bin is written in the file) - sed -i "s#$pkgdir##g" $pkgdir/usr/bin/paintown - install -m644 $srcdir/paintown.desktop $pkgdir/usr/share/applications/paintown.desktop - install -m644 $srcdir/paintown.png $pkgdir/usr/share/pixmaps/paintown.png - install -m644 LICENSE $pkgdir/usr/share/licenses/paintown/LICENSE - install -m644 LEGAL $pkgdir/usr/share/licenses/paintown/LEGAL -} - -# vim:set ts=2 sw=2 et: diff --git a/community/paintown/libpng15.patch b/community/paintown/libpng15.patch deleted file mode 100644 index 516c3ec01..000000000 --- a/community/paintown/libpng15.patch +++ /dev/null @@ -1,343 +0,0 @@ ------------------------------------------------------------------------- -r7015 | kazzmir | 2012-02-18 22:19:01 +0100 (Sa, 18 Feb 2012) | 1 line - -patch for sdl image to work with libpng1.4+ - -Index: src/util/sdl/image/IMG_png.c -=================================================================== ---- src/util/sdl/image/IMG_png.c (revision 7014) -+++ src/util/sdl/image/IMG_png.c (revision 7015) -@@ -71,6 +71,10 @@ - #endif - #include <png.h> - -+/* Check for the older version of libpng */ -+#if (PNG_LIBPNG_VER_MAJOR == 1) && (PNG_LIBPNG_VER_MINOR < 4) -+#define LIBPNG_VERSION_12 -+#endif - - static struct { - int loaded; -@@ -80,6 +84,8 @@ - void (*png_destroy_read_struct) (png_structpp png_ptr_ptr, png_infopp info_ptr_ptr, png_infopp end_info_ptr_ptr); - png_uint_32 (*png_get_IHDR) (png_structp png_ptr, png_infop info_ptr, png_uint_32 *width, png_uint_32 *height, int *bit_depth, int *color_type, int *interlace_method, int *compression_method, int *filter_method); - png_voidp (*png_get_io_ptr) (png_structp png_ptr); -+ png_byte (*png_get_channels) (png_structp png_ptr, png_infop info_ptr); -+ png_uint_32 (*png_get_PLTE) (png_structp png_ptr, png_infop info_ptr, png_colorp *palette, int *num_palette); - png_uint_32 (*png_get_tRNS) (png_structp png_ptr, png_infop info_ptr, png_bytep *trans, int *num_trans, png_color_16p *trans_values); - png_uint_32 (*png_get_valid) (png_structp png_ptr, png_infop info_ptr, png_uint_32 flag); - void (*png_read_image) (png_structp png_ptr, png_bytepp image); -@@ -91,6 +97,9 @@ - void (*png_set_read_fn) (png_structp png_ptr, png_voidp io_ptr, png_rw_ptr read_data_fn); - void (*png_set_strip_16) (png_structp png_ptr); - int (*png_sig_cmp) (png_bytep sig, png_size_t start, png_size_t num_to_check); -+#ifndef LIBPNG_VERSION_12 -+ jmp_buf* (*png_set_longjmp_fn) (png_structp, png_longjmp_ptr, size_t); -+#endif - } lib; - - #ifdef LOAD_PNG_DYNAMIC -@@ -129,6 +138,13 @@ - SDL_UnloadObject(lib.handle); - return -1; - } -+ lib.png_get_channels = -+ (png_byte (*) (png_structp, png_infop)) -+ SDL_LoadFunction(lib.handle, "png_get_channels"); -+ if ( lib.png_get_channels == NULL ) { -+ SDL_UnloadObject(lib.handle); -+ return -1; -+ } - lib.png_get_io_ptr = - (png_voidp (*) (png_structp)) - SDL_LoadFunction(lib.handle, "png_get_io_ptr"); -@@ -136,6 +152,13 @@ - SDL_UnloadObject(lib.handle); - return -1; - } -+ lib.png_get_PLTE = -+ (png_uint_32 (*) (png_structp, png_infop, png_colorp *, int *)) -+ SDL_LoadFunction(lib.handle, "png_get_PLTE"); -+ if ( lib.png_get_PLTE == NULL ) { -+ SDL_UnloadObject(lib.handle); -+ return -1; -+ } - lib.png_get_tRNS = - (png_uint_32 (*) (png_structp, png_infop, png_bytep *, int *, png_color_16p *)) - SDL_LoadFunction(lib.handle, "png_get_tRNS"); -@@ -213,6 +236,15 @@ - SDL_UnloadObject(lib.handle); - return -1; - } -+#ifndef LIBPNG_VERSION_12 -+ lib.png_set_longjmp_fn = -+ (jmp_buf * (*) (png_structp, png_longjmp_ptr, size_t)) -+ SDL_LoadFunction(lib.handle, "png_set_longjmp_fn"); -+ if ( lib.png_set_longjmp_fn == NULL ) { -+ SDL_UnloadObject(lib.handle); -+ return -1; -+ } -+#endif - } - ++lib.loaded; - -@@ -236,7 +268,9 @@ - lib.png_create_read_struct = png_create_read_struct; - lib.png_destroy_read_struct = png_destroy_read_struct; - lib.png_get_IHDR = png_get_IHDR; -+ lib.png_get_channels = png_get_channels; - lib.png_get_io_ptr = png_get_io_ptr; -+ lib.png_get_PLTE = png_get_PLTE; - lib.png_get_tRNS = png_get_tRNS; - lib.png_get_valid = png_get_valid; - lib.png_read_image = png_read_image; -@@ -248,6 +282,9 @@ - lib.png_set_read_fn = png_set_read_fn; - lib.png_set_strip_16 = png_set_strip_16; - lib.png_sig_cmp = png_sig_cmp; -+#ifndef LIBPNG_VERSION_12 -+ lib.png_set_longjmp_fn = png_set_longjmp_fn; -+#endif - } - ++lib.loaded; - -@@ -347,7 +384,12 @@ - * 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) ) { -+#ifndef LIBPNG_VERSION_12 -+ if ( setjmp(*lib.png_set_longjmp_fn(png_ptr, longjmp, sizeof (jmp_buf))) ) -+#else -+ if ( setjmp(png_ptr->jmpbuf) ) -+#endif -+ { - error = "Error reading the PNG file."; - goto done; - } -@@ -416,9 +458,9 @@ - Rmask = 0x000000FF; - Gmask = 0x0000FF00; - Bmask = 0x00FF0000; -- Amask = (info_ptr->channels == 4) ? 0xFF000000 : 0; -+ Amask = (lib.png_get_channels(png_ptr, info_ptr) == 4) ? 0xFF000000 : 0; - } else { -- int s = (info_ptr->channels == 4) ? 0 : 8; -+ int s = (lib.png_get_channels(png_ptr, info_ptr) == 4) ? 0 : 8; - Rmask = 0xFF000000 >> s; - Gmask = 0x00FF0000 >> s; - Bmask = 0x0000FF00 >> s; -@@ -426,7 +468,7 @@ - } - } - surface = SDL_AllocSurface(SDL_SWSURFACE, width, height, -- bit_depth*info_ptr->channels, Rmask,Gmask,Bmask,Amask); -+ bit_depth*lib.png_get_channels(png_ptr, info_ptr), Rmask,Gmask,Bmask,Amask); - if ( surface == NULL ) { - error = "Out of memory"; - goto done; -@@ -444,7 +486,7 @@ - - /* Create the array of pointers to image data */ - row_pointers = (png_bytep*) malloc(sizeof(png_bytep)*height); -- if ( (row_pointers == NULL) ) { -+ if (row_pointers == NULL) { - error = "Out of memory"; - goto done; - } -@@ -467,6 +509,9 @@ - /* Load the palette, if any */ - palette = surface->format->palette; - if ( palette ) { -+ int png_num_palette; -+ png_colorp png_palette; -+ lib.png_get_PLTE(png_ptr, info_ptr, &png_palette, &png_num_palette); - if(color_type == PNG_COLOR_TYPE_GRAY) { - palette->ncolors = 256; - for(i = 0; i < 256; i++) { -@@ -474,12 +519,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( 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( 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; - } - } - } -Index: src/util/sdl/image/sdl-image-1.2.10-libpng15.patch -=================================================================== ---- src/util/sdl/image/sdl-image-1.2.10-libpng15.patch (revision 0) -+++ src/util/sdl/image/sdl-image-1.2.10-libpng15.patch (revision 7015) -@@ -0,0 +1,160 @@ -+--- IMG_png.c -++++ IMG_png.c -+@@ -71,6 +71,10 @@ -+ #endif -+ #include <png.h> -+ -++/* Check for the older version of libpng */ -++#if (PNG_LIBPNG_VER_MAJOR == 1) && (PNG_LIBPNG_VER_MINOR < 4) -++#define LIBPNG_VERSION_12 -++#endif -+ -+ static struct { -+ int loaded; -+@@ -80,6 +84,8 @@ -+ void (*png_destroy_read_struct) (png_structpp png_ptr_ptr, png_infopp info_ptr_ptr, png_infopp end_info_ptr_ptr); -+ png_uint_32 (*png_get_IHDR) (png_structp png_ptr, png_infop info_ptr, png_uint_32 *width, png_uint_32 *height, int *bit_depth, int *color_type, int *interlace_method, int *compression_method, int *filter_method); -+ png_voidp (*png_get_io_ptr) (png_structp png_ptr); -++ png_byte (*png_get_channels) (png_structp png_ptr, png_infop info_ptr); -++ png_uint_32 (*png_get_PLTE) (png_structp png_ptr, png_infop info_ptr, png_colorp *palette, int *num_palette); -+ png_uint_32 (*png_get_tRNS) (png_structp png_ptr, png_infop info_ptr, png_bytep *trans, int *num_trans, png_color_16p *trans_values); -+ png_uint_32 (*png_get_valid) (png_structp png_ptr, png_infop info_ptr, png_uint_32 flag); -+ void (*png_read_image) (png_structp png_ptr, png_bytepp image); -+@@ -91,6 +97,9 @@ -+ void (*png_set_read_fn) (png_structp png_ptr, png_voidp io_ptr, png_rw_ptr read_data_fn); -+ void (*png_set_strip_16) (png_structp png_ptr); -+ int (*png_sig_cmp) (png_bytep sig, png_size_t start, png_size_t num_to_check); -++#ifndef LIBPNG_VERSION_12 -++ jmp_buf* (*png_set_longjmp_fn) (png_structp, png_longjmp_ptr, size_t); -++#endif -+ } lib; -+ -+ #ifdef LOAD_PNG_DYNAMIC -+@@ -129,6 +138,13 @@ -+ SDL_UnloadObject(lib.handle); -+ return -1; -+ } -++ lib.png_get_channels = -++ (png_byte (*) (png_structp, png_infop)) -++ SDL_LoadFunction(lib.handle, "png_get_channels"); -++ if ( lib.png_get_channels == NULL ) { -++ SDL_UnloadObject(lib.handle); -++ return -1; -++ } -+ lib.png_get_io_ptr = -+ (png_voidp (*) (png_structp)) -+ SDL_LoadFunction(lib.handle, "png_get_io_ptr"); -+@@ -136,6 +152,13 @@ -+ SDL_UnloadObject(lib.handle); -+ return -1; -+ } -++ lib.png_get_PLTE = -++ (png_uint_32 (*) (png_structp, png_infop, png_colorp *, int *)) -++ SDL_LoadFunction(lib.handle, "png_get_PLTE"); -++ if ( lib.png_get_PLTE == NULL ) { -++ SDL_UnloadObject(lib.handle); -++ return -1; -++ } -+ lib.png_get_tRNS = -+ (png_uint_32 (*) (png_structp, png_infop, png_bytep *, int *, png_color_16p *)) -+ SDL_LoadFunction(lib.handle, "png_get_tRNS"); -+@@ -213,6 +236,15 @@ -+ SDL_UnloadObject(lib.handle); -+ return -1; -+ } -++#ifndef LIBPNG_VERSION_12 -++ lib.png_set_longjmp_fn = -++ (jmp_buf * (*) (png_structp, png_longjmp_ptr, size_t)) -++ SDL_LoadFunction(lib.handle, "png_set_longjmp_fn"); -++ if ( lib.png_set_longjmp_fn == NULL ) { -++ SDL_UnloadObject(lib.handle); -++ return -1; -++ } -++#endif -+ } -+ ++lib.loaded; -+ -+@@ -236,7 +268,9 @@ -+ lib.png_create_read_struct = png_create_read_struct; -+ lib.png_destroy_read_struct = png_destroy_read_struct; -+ lib.png_get_IHDR = png_get_IHDR; -++ lib.png_get_channels = png_get_channels; -+ lib.png_get_io_ptr = png_get_io_ptr; -++ lib.png_get_PLTE = png_get_PLTE; -+ lib.png_get_tRNS = png_get_tRNS; -+ lib.png_get_valid = png_get_valid; -+ lib.png_read_image = png_read_image; -+@@ -248,6 +282,9 @@ -+ lib.png_set_read_fn = png_set_read_fn; -+ lib.png_set_strip_16 = png_set_strip_16; -+ lib.png_sig_cmp = png_sig_cmp; -++#ifndef LIBPNG_VERSION_12 -++ lib.png_set_longjmp_fn = png_set_longjmp_fn; -++#endif -+ } -+ ++lib.loaded; -+ -+@@ -347,7 +384,12 @@ -+ * 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) ) { -++#ifndef LIBPNG_VERSION_12 -++ if ( setjmp(*lib.png_set_longjmp_fn(png_ptr, longjmp, sizeof (jmp_buf))) ) -++#else -++ if ( setjmp(png_ptr->jmpbuf) ) -++#endif -++ { -+ error = "Error reading the PNG file."; -+ goto done; -+ } -+@@ -416,9 +458,9 @@ -+ Rmask = 0x000000FF; -+ Gmask = 0x0000FF00; -+ Bmask = 0x00FF0000; -+- Amask = (info_ptr->channels == 4) ? 0xFF000000 : 0; -++ Amask = (lib.png_get_channels(png_ptr, info_ptr) == 4) ? 0xFF000000 : 0; -+ } else { -+- int s = (info_ptr->channels == 4) ? 0 : 8; -++ int s = (lib.png_get_channels(png_ptr, info_ptr) == 4) ? 0 : 8; -+ Rmask = 0xFF000000 >> s; -+ Gmask = 0x00FF0000 >> s; -+ Bmask = 0x0000FF00 >> s; -+@@ -426,7 +468,7 @@ -+ } -+ } -+ surface = SDL_AllocSurface(SDL_SWSURFACE, width, height, -+- bit_depth*info_ptr->channels, Rmask,Gmask,Bmask,Amask); -++ bit_depth*lib.png_get_channels(png_ptr, info_ptr), Rmask,Gmask,Bmask,Amask); -+ if ( surface == NULL ) { -+ error = "Out of memory"; -+ goto done; -+@@ -467,6 +509,9 @@ -+ /* Load the palette, if any */ -+ palette = surface->format->palette; -+ if ( palette ) { -++ int png_num_palette; -++ png_colorp png_palette; -++ lib.png_get_PLTE(png_ptr, info_ptr, &png_palette, &png_num_palette); -+ if(color_type == PNG_COLOR_TYPE_GRAY) { -+ palette->ncolors = 256; -+ for(i = 0; i < 256; i++) { -+@@ -474,12 +519,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( 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( 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; -+ } -+ } -+ } - ------------------------------------------------------------------------- diff --git a/community/paintown/paintown.png b/community/paintown/paintown.png Binary files differdeleted file mode 100644 index c7e4830e4..000000000 --- a/community/paintown/paintown.png +++ /dev/null |
