diff options
Diffstat (limited to 'artistic')
| -rw-r--r-- | artistic/blender-spacenav-libre/PKGBUILD | 124 | ||||
| -rw-r--r-- | artistic/cinepaint-lts/LICENSE | 25 | ||||
| -rw-r--r-- | artistic/cinepaint-lts/PKGBUILD | 62 | ||||
| -rw-r--r-- | artistic/cinepaint-lts/cinepaint-libpng15.patch | 446 | ||||
| -rw-r--r-- | artistic/cinepaint-lts/cinepaint.install | 11 | ||||
| -rw-r--r-- | artistic/spnavcfg/PKGBUILD | 13 |
6 files changed, 629 insertions, 52 deletions
diff --git a/artistic/blender-spacenav-libre/PKGBUILD b/artistic/blender-spacenav-libre/PKGBUILD index 73968cd4b..9ef4b7b07 100644 --- a/artistic/blender-spacenav-libre/PKGBUILD +++ b/artistic/blender-spacenav-libre/PKGBUILD @@ -1,65 +1,97 @@ # $Id$ # Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> -_pkgname=blender pkgname=blender-spacenav-libre -pkgver=2.63a -pkgrel=5 -pkgdesc="A fully integrated 3D graphics creation suite, compiled with spacenav (without nonfree cuda-toolkit support)" -arch=('i686' 'x86_64' 'mips64el') -license=('GPL') -url="http://www.blender.org" -depends=('libpng' 'libtiff' 'openexr' 'python' 'desktop-file-utils' - 'shared-mime-info' 'hicolor-icon-theme' 'xdg-utils' 'glew' - 'freetype2' 'openal' 'ffmpeg' 'fftw' 'boost-libs' 'opencollada' - 'openimageio' 'libsndfile' 'jack' 'libspnav') -makedepends=('cmake' 'boost') -replaces=("${_pkgname}") -conflicts=("${_pkgname}" "${_pkgname}-libre") -provides=("${_pkgname}=${pkgver}" "${_pkgname}-libre=${pkgver}") -install=${_pkgname}.install -source=(http://download.${_pkgname}.org/source/${_pkgname}-${pkgver}.tar.gz - ffmpeg-0.11.patch - boost-1.50.patch) -md5sums=('31a60b3ce5466d965cb7e2648995e092' - '9e5649403e51654615d30b10bc460217' - '0bab80da07d980c47b8ce3cb998edaef') +pkgver=2.64a +pkgrel=1 +pkgaev=5 +pkgdesc='A fully integrated 3D graphics creation suite, compiled with spacenav (without nonfree cuda-toolkit support)' +arch=( + i686 + x86_64 + mips64el +) +license=( + GPL +) +url=http://www.${pkgname%-spacenav-libre}.org +depends=( + boost-libs + desktop-file-utils + ffmpeg + fftw + freetype2 + glew + glu + hicolor-icon-theme + jack + libgl + libpng + libsndfile + libspnav + libtiff + openal + opencollada + opencolorio + openexr + openimageio + python + shared-mime-info + xdg-utils +) +makedepends=( + mesa + boost + cmake + subversion +) +replaces=( + ${pkgname%-spacenav-libre} +) +conflicts=( + ${pkgname%-spacenav-libre} +) +provides=( + ${pkgname%-spacenav-libre}=$pkgaev:$pkgver +) +install=${pkgname%-spacenav-libre}.install +source=( + http://download.${pkgname%-spacenav-libre}.org/source/${pkgname%-spacenav-libre}-$pkgver.tar.gz +) +sha512sums=( + 77d171a36f1c87a82613ed7601df9cef444069a2a6600e05260607e9a2009c292068a2b4753f3cbd53d820cdc8d9ed88ddd1685f20647b943f75bfbeb905b9b5 +) build() { - cd "${srcdir}/${_pkgname}-${pkgver}" - - patch -Np1 < "${srcdir}"/ffmpeg-0.11.patch - patch -Np1 < "${srcdir}"/boost-1.50.patch - sed -i "/<libavcodec\/opt.h>/d" intern/ffmpeg/ffmpeg_compat.h - sed -i "/<libavcodec\/opt.h>/d" source/blender/blenkernel/intern/writeffmpeg.c + cd $srcdir/${pkgname%-spacenav-libre}-$pkgver mkdir build cd build - [[ $CARCH == i686 ]] && ENABLESSE2="-DSUPPORT_SSE2_BUILD=OFF" + [[ $CARCH == i686 ]] && DSUPPORT_SSE2_BUILD='-DSUPPORT_SSE2_BUILD=OFF' cmake .. \ - -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release \ - -DWITH_INSTALL_PORTABLE=OFF \ - -DWITH_PYTHON_INSTALL=OFF \ - -DWITH_OPENCOLLADA=ON \ - -DOPENIMAGEIO_ROOT_DIR=/usr \ - -DWITH_GAMEENGINE=ON \ - -DWITH_JACK=ON \ - -DWITH_PLAYER=ON \ - -DWITH_BUILTIN_GLEW=OFF \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DPYTHON_INCLUDE_DIRS=/usr/include/python3.2mu \ + -DPYTHON_LIBPATH=/usr/lib \ + -DPYTHON_LIBRARY=python3.2mu \ + -DPYTHON_VERSION=3.2 \ + $DSUPPORT_SSE2_BUILD \ -DWITH_CODEC_FFMPEG=ON \ -DWITH_CODEC_SNDFILE=ON \ -DWITH_CYCLES=ON \ -DWITH_CYCLES_CUDA_BINARIES=OFF \ -DWITH_FFTW3=ON \ + -DWITH_GAMEENGINE=ON \ + -DWITH_IMAGE_REDCODE=OFF \ + -DWITH_INSTALL_PORTABLE=OFF \ + -DWITH_JACK=ON \ -DWITH_MOD_OCEANSIM=ON \ - -DPYTHON_VERSION=3.2 \ - -DPYTHON_LIBPATH=/usr/lib \ - -DPYTHON_LIBRARY=python3.2mu \ - -DPYTHON_INCLUDE_DIRS=/usr/include/python3.2mu \ - $ENABLESSE2 + -DWITH_OPENCOLLADA=ON \ + -DWITH_PLAYER=ON \ + -DWITH_PYTHON_INSTALL=OFF \ + -DWITH_SYSTEM_GLEW=ON make $MAKEFLAGS @@ -67,7 +99,7 @@ build() { } package() { - cd "${srcdir}/${_pkgname}-${pkgver}/build" - make DESTDIR="${pkgdir}" install - python -m compileall "${pkgdir}/usr/share/blender" + cd $srcdir/${pkgname%-spacenav-libre}-$pkgver/build + make DESTDIR=$pkgdir install + python -m compileall $pkgdir/usr/share/blender } diff --git a/artistic/cinepaint-lts/LICENSE b/artistic/cinepaint-lts/LICENSE new file mode 100644 index 000000000..746207229 --- /dev/null +++ b/artistic/cinepaint-lts/LICENSE @@ -0,0 +1,25 @@ +Copyright (c) 2005, Kai-Uwe Behrmann +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided + with the distribution.ntributors may be used to endorse or promote + products derived from this software without specific prior written + permission. +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/artistic/cinepaint-lts/PKGBUILD b/artistic/cinepaint-lts/PKGBUILD new file mode 100644 index 000000000..c680ac904 --- /dev/null +++ b/artistic/cinepaint-lts/PKGBUILD @@ -0,0 +1,62 @@ +# $Id$ +# Maintainer: tobias [tobias.archlinux.org] +# Contributor: tobias [tobias.justdreams.de] +# Maintainer (Parabola): Márcio Silva <coadde@adinet.com.uy> + +pkgname=cinepaint-lts +pkgver=1.0 +pkgrel=1 +pkgdesc='Sophisticated graphics manipulation programm supporting > 8bit pictures' +arch=(i686 x86_64 mips64el) +license=(LGPL GPL MIT) +url=http://www.${pkgname%-lts}.org +depends=(gtk2 openexr lcms libxpm fltk ftgl libxxf86vm) +makedepends=(python2 gutenprint) +optdepends=( + 'python2: for python plug-ins' + 'gutenprint: for print plug-ins' + 'ghostscript: for pdf plug-ins' +) +conflicts=(${pkgname%-lts}) +provides=(${pkgname%-lts}) +options=(!libtool) +install=${pkgname%-lts}.install +source=( + http://sourceforge.net/projects/${pkgname%-lts}/files/CinePaint/${pkgname%-lts}-$pkgver.tgz + LICENSE + ${pkgname%-lts}-libpng15.patch +) +md5sums=( + 7dfdb005d246578392ac9bd500534804 + 169085743f667c250ea2e4022efecf5f + 6d3f65b72e0f1569a9efe1bcab1b8124 +) + +build() { + cd $srcdir/${pkgname%-lts} + + rm config.{sub,guess} + ln -s /usr/share/automake-1.12/config.sub config.sub + ln -s /usr/share/automake-1.12/config.guess config.guess + + patch -p1 -i ../${pkgname%-lts}-libpng15.patch + find plug-ins/pygimp -type f -exec sed -i 's#env python#env python2#' {} + + sed -i 's|$(LDFLAGS) -o|$(LDFLAGS) $(GTK_LIBS) -o|' lib/Makefile.in + sed -i -e '1 s/^/#include <unistd.h>\n/' plug-ins/icc_examin/icc_examin/icc_modell_beobachter.cpp + + sh autogen.sh + LIBS+="-lstdc++ -lm -lX11" ./configure --prefix=/usr --libdir=/usr/lib --mandir=/usr/share/man \ + --enable-gtk2 --enable-pygimp --with-python=/usr/bin/python2 + sed -i 's/-Wl,,/-Wl,/' lib/fl_i18n/Makefile plug-ins/bracketing_to_hdr/Makefile \ + plug-ins/collect/Makefile plug-ins/icc_examin/icc_examin/Makefile plug-ins/pdf/Makefile + make +} + +package() { + cd $srcdir/${pkgname%-lts} + make DESTDIR=$pkgdir install + sed -i -e "s|-I$srcdir/${pkgname%-lts}||" -e "s|-I$srcdir/${pkgname%-lts}/lib||" -e "/lib${pkgname%-lts}.la/d" \ + -e "s|${srcdir}/${pkgname%-lts}/lib/.libs/\$dlname||" $pkgdir/usr/bin/${pkgname%-lts}tool + sed -i "s/${pkgname%-lts}.png/${pkgname%-lts}/" $pkgdir/usr/share/applications/${pkgname%-lts}.desktop + install -D -m644 $srcdir/LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE +} diff --git a/artistic/cinepaint-lts/cinepaint-libpng15.patch b/artistic/cinepaint-lts/cinepaint-libpng15.patch new file mode 100644 index 000000000..619d9af42 --- /dev/null +++ b/artistic/cinepaint-lts/cinepaint-libpng15.patch @@ -0,0 +1,446 @@ +diff -Nur a/plug-ins/png/png.c b/plug-ins/png/png.c +--- a/plug-ins/png/png.c 2006-11-24 18:52:55.000000000 -0200 ++++ b/plug-ins/png/png.c 2012-10-12 01:07:56.452245955 -0200 +@@ -390,6 +390,16 @@ + gchar *progress; /* Title for progress display... */ + guchar alpha[256], /* Index -> Alpha */ + *alpha_ptr; /* Temporary pointer */ ++ png_byte color_type; ++ png_byte bit_depth; ++ png_colorp palette; ++ int num_palette; ++ png_charpp iccp_name; ++ int compression_type; ++ png_bytepp iccp_profile; ++ png_uint_32 iccp_proflen; ++ png_uint_32 width, height; ++ png_byte channels; + + /* + * PNG 0.89 and newer have a sane, forwards compatible constructor. +@@ -405,7 +415,7 @@ + info = (png_infop)calloc(sizeof(png_info), 1); + #endif /* PNG_LIBPNG_VER > 88 */ + +- if (setjmp (pp->jmpbuf)) ++ if (setjmp (png_jmpbuf(pp))) + { + g_message ("%s\nPNG error. File corrupted?", filename); + return image; +@@ -442,21 +452,26 @@ + */ + + png_read_info(pp, info); ++ color_type = png_get_color_type(pp, info); ++ width=png_get_image_width(pp, info); ++ height=png_get_image_height(pp, info); + + /* + * Latest attempt, this should be my best yet :) + */ + ++ bit_depth = png_get_bit_depth(pp, info); ++ + #ifndef WORDS_BIGENDIAN +- if(info->bit_depth == 16) ++ if(bit_depth == 16) + png_set_swap(pp); + #endif + +- if (info->color_type == PNG_COLOR_TYPE_GRAY && info->bit_depth < 8) { ++ if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) { + png_set_expand(pp); + } + +- if (info->color_type == PNG_COLOR_TYPE_PALETTE && info->bit_depth < 8) { ++ if (color_type == PNG_COLOR_TYPE_PALETTE && bit_depth < 8) { + png_set_packing(pp); + } + +@@ -464,8 +479,8 @@ + * Expand G+tRNS to GA, RGB+tRNS to RGBA + */ + +- if (info->color_type != PNG_COLOR_TYPE_PALETTE && +- (info->valid & PNG_INFO_tRNS)) { ++ if (color_type != PNG_COLOR_TYPE_PALETTE && ++ (png_get_valid(pp, info, PNG_INFO_tRNS))) { + png_set_expand(pp); + } + +@@ -482,7 +497,7 @@ + + #if PNG_LIBPNG_VER > 99 + if (png_get_valid(pp, info, PNG_INFO_tRNS) && +- info->color_type == PNG_COLOR_TYPE_PALETTE) ++ color_type == PNG_COLOR_TYPE_PALETTE) + { + png_get_tRNS(pp, info, &alpha_ptr, &num, NULL); + /* Copy the existing alpha values from the tRNS chunk */ +@@ -505,9 +520,9 @@ + + png_read_update_info(pp, info); + +- if(info->bit_depth==16) ++ if(bit_depth==16) + { +- switch (info->color_type) ++ switch (color_type) + { + case PNG_COLOR_TYPE_RGB : /* RGB */ + bpp = 6; +@@ -545,7 +560,7 @@ + } + else + { +- switch (info->color_type) ++ switch (color_type) + { + case PNG_COLOR_TYPE_RGB : /* RGB */ + bpp = 3; +@@ -582,7 +597,7 @@ + }; + } + +- image = gimp_image_new(info->width, info->height, image_type); ++ image = gimp_image_new(width, height, image_type); + if (image == -1) + { + g_message("Can't allocate new image\n%s", filename); +@@ -595,7 +610,7 @@ + * Create the "background" layer to hold the image... + */ + +- layer = gimp_layer_new(image, _("Background"), info->width, info->height, ++ layer = gimp_layer_new(image, _("Background"), width, height, + layer_type, 100, NORMAL_MODE); + gimp_image_add_layer(image, layer, 0); + +@@ -627,20 +642,21 @@ + + empty= 0; /* by default assume no full transparent palette entries */ + +- if (info->color_type & PNG_COLOR_MASK_PALETTE) { ++ if (color_type & PNG_COLOR_MASK_PALETTE) { + + #if PNG_LIBPNG_VER > 99 ++ png_get_PLTE(pp, info, &palette, &num_palette); + if (png_get_valid(pp, info, PNG_INFO_tRNS)) { + for (empty= 0; empty < 256 && alpha[empty] == 0; ++empty); + /* Calculates number of fully transparent "empty" entries */ + +- gimp_image_set_cmap(image, (guchar *) (info->palette + empty), +- info->num_palette - empty); ++ gimp_image_set_cmap(image, (guchar *) (palette + empty), ++ num_palette - empty); + } else { +- gimp_image_set_cmap(image, (guchar *)info->palette, info->num_palette); ++ gimp_image_set_cmap(image, (guchar *)palette, num_palette); + } + #else +- gimp_image_set_cmap(image, (guchar *)info->palette, info->num_palette); ++ gimp_image_set_cmap(image, (guchar *)palette, num_palette); + #endif /* PNG_LIBPNG_VER > 99 */ + + } +@@ -659,18 +675,19 @@ + */ + + tile_height = gimp_tile_height (); +- pixel = g_new(guchar, tile_height * info->width * bpp); ++ pixel = g_new(guchar, tile_height * width * bpp); + pixels = g_new(guchar *, tile_height); ++ channels=png_get_channels(pp, info); + +- if(info->bit_depth==16) ++ if(bit_depth==16) + { + for (i = 0; i < tile_height; i ++) +- pixels[i] = pixel + info->width * info->channels * i * 2; ++ pixels[i] = pixel + width * channels * i * 2; + } + else + { + for (i = 0; i < tile_height; i ++) +- pixels[i] = pixel + info->width * info->channels * i; ++ pixels[i] = pixel + width * channels * i; + } + + for (pass = 0; pass < num_passes; pass ++) +@@ -680,11 +697,11 @@ + */ + + for (begin = 0, end = tile_height; +- begin < info->height; ++ begin < height; + begin += tile_height, end += tile_height) + { +- if (end > info->height) +- end = info->height; ++ if (end > height) ++ end = height; + + num = end - begin; + +@@ -697,20 +714,21 @@ + gimp_pixel_rgn_set_rect(&pixel_rgn, pixel, 0, begin, + drawable->width, num); + +- gimp_progress_update(((double)pass + (double)end / (double)info->height) / ++ gimp_progress_update(((double)pass + (double)end / (double)height) / + (double)num_passes); + }; + }; + + #if defined(PNG_iCCP_SUPPORTED) + /* set icc profile */ +- if (info->iccp_proflen > 0) { +- gimp_image_set_icc_profile_by_mem (image, info->iccp_proflen, +- info->iccp_profile, +- ICC_IMAGE_PROFILE); ++ png_get_iCCP(pp, info, (png_charpp)iccp_name, &compression_type, iccp_profile, &iccp_proflen); ++ if (iccp_proflen > 0) { ++ gimp_image_set_icc_profile_by_mem (image, iccp_proflen, ++ (gchar *)iccp_profile, ++ ICC_IMAGE_PROFILE); + printf ("%s:%d %s() set embedded profile \"%s\"\n", + __FILE__,__LINE__,__func__, +- info->iccp_name); ++ (char *)iccp_name); + } + #endif + +@@ -808,6 +826,14 @@ + blue; /* Used for palette background */ + time_t cutime; /* Time since epoch */ + struct tm *gmt; /* GMT broken down */ ++ png_byte color_type; ++ png_byte bit_depth; ++ int filter_method=0; ++ png_colorp palette; ++ int num_palette; ++ png_charpp iccp_name; ++ png_uint_32 height; ++ int compression_type; + + /* + * PNG 0.89 and newer have a sane, forwards compatible constructor. +@@ -824,7 +850,7 @@ + info = (png_infop)calloc(sizeof(png_info), 1); + #endif /* PNG_LIBPNG_VER > 88 */ + +- if (setjmp (pp->jmpbuf)) ++ if (setjmp (png_jmpbuf(pp))) + { + g_message ("%s\nPNG error. Couldn't save image", filename); + return 0; +@@ -858,87 +884,75 @@ + type = gimp_drawable_type (drawable_ID); + + /* +- * Set the image dimensions, bit depth, interlacing and compression +- */ +- +- png_set_compression_level (pp, pngvals.compression_level); +- +- info->width = drawable->width; +- info->height = drawable->height; +- info->interlace_type = pngvals.interlaced; +- +- /* + * Set color type and remember bytes per pixel count + */ + + switch (type) + { + case RGB_IMAGE : +- info->color_type = PNG_COLOR_TYPE_RGB; +- info->bit_depth = 8; ++ color_type = PNG_COLOR_TYPE_RGB; ++ bit_depth = 8; + bpp = 3; + break; + case RGBA_IMAGE : +- info->color_type = PNG_COLOR_TYPE_RGB_ALPHA; +- info->bit_depth = 8; ++ color_type = PNG_COLOR_TYPE_RGB_ALPHA; ++ bit_depth = 8; + bpp = 4; + break; + case GRAY_IMAGE : +- info->color_type = PNG_COLOR_TYPE_GRAY; +- info->bit_depth = 8; ++ color_type = PNG_COLOR_TYPE_GRAY; ++ bit_depth = 8; + bpp = 1; + break; + case GRAYA_IMAGE : +- info->color_type = PNG_COLOR_TYPE_GRAY_ALPHA; +- info->bit_depth = 8; ++ color_type = PNG_COLOR_TYPE_GRAY_ALPHA; ++ bit_depth = 8; + bpp = 2; + break; + case INDEXED_IMAGE : + bpp = 1; +- info->bit_depth = 8; +- info->color_type = PNG_COLOR_TYPE_PALETTE; +- info->valid |= PNG_INFO_PLTE; +- info->palette= (png_colorp) gimp_image_get_cmap(image_ID, &num_colors); +- info->num_palette= num_colors; ++ bit_depth = 8; ++ color_type = PNG_COLOR_TYPE_PALETTE; ++ png_get_valid(pp, info, PNG_INFO_PLTE); ++ png_set_PLTE(pp, info, (png_colorp) gimp_image_get_cmap(image_ID, &num_colors), num_colors); + break; + case INDEXEDA_IMAGE : + bpp = 2; +- info->bit_depth = 8; +- info->color_type = PNG_COLOR_TYPE_PALETTE; ++ bit_depth = 8; ++ color_type = PNG_COLOR_TYPE_PALETTE; + respin_cmap (pp, info, image_ID); /* fix up transparency */ + break; + case U16_RGB_IMAGE : +- info->color_type = PNG_COLOR_TYPE_RGB; +- info->bit_depth = 16; ++ color_type = PNG_COLOR_TYPE_RGB; ++ bit_depth = 16; + bpp = 6; + break; + case U16_RGBA_IMAGE : +- info->color_type = PNG_COLOR_TYPE_RGB_ALPHA; +- info->bit_depth = 16; ++ color_type = PNG_COLOR_TYPE_RGB_ALPHA; ++ bit_depth = 16; + bpp = 8; + break; + case U16_GRAY_IMAGE : +- info->color_type = PNG_COLOR_TYPE_GRAY; +- info->bit_depth = 16; ++ color_type = PNG_COLOR_TYPE_GRAY; ++ bit_depth = 16; + bpp = 2; + break; + case U16_GRAYA_IMAGE : +- info->color_type = PNG_COLOR_TYPE_GRAY_ALPHA; +- info->bit_depth = 16; ++ color_type = PNG_COLOR_TYPE_GRAY_ALPHA; ++ bit_depth = 16; + bpp = 4; + break; + case U16_INDEXED_IMAGE : + bpp = 2; +- info->bit_depth = 16; +- info->color_type = PNG_COLOR_TYPE_PALETTE; +- info->valid |= PNG_INFO_PLTE; +- info->palette= (png_colorp) gimp_image_get_cmap(image_ID, &num_colors); +- info->num_palette= num_colors; ++ bit_depth = 16; ++ color_type = PNG_COLOR_TYPE_PALETTE; ++ png_get_valid(pp, info, PNG_INFO_PLTE); ++ png_set_PLTE(pp, info, (png_colorp) gimp_image_get_cmap(image_ID, &num_colors), num_colors); + break; + case U16_INDEXEDA_IMAGE : + bpp = 4; +- info->bit_depth = 16; +- info->color_type = PNG_COLOR_TYPE_PALETTE; ++ bit_depth = 16; ++ color_type = PNG_COLOR_TYPE_PALETTE; + respin_cmap (pp, info, image_ID); /* fix up transparency */ + break; + default: +@@ -950,16 +964,22 @@ + * Fix bit depths for (possibly) smaller colormap images + */ + +- if (info->valid & PNG_INFO_PLTE) { +- if (info->num_palette <= 2) +- info->bit_depth= 1; +- else if (info->num_palette <= 4) +- info->bit_depth= 2; +- else if (info->num_palette <= 16) +- info->bit_depth= 4; ++ if (png_get_valid(pp, info, PNG_INFO_PLTE)) { ++ png_get_PLTE(pp, info, &palette, &num_palette); ++ if (num_palette <= 2) ++ bit_depth= 1; ++ else if (num_palette <= 4) ++ bit_depth= 2; ++ else if (num_palette <= 16) ++ bit_depth= 4; + /* otherwise the default is fine */ + } + ++ png_set_compression_level (pp, pngvals.compression_level); ++ png_set_IHDR(pp, info, drawable->width, drawable->height, ++ bit_depth, color_type, pngvals.interlaced, compression_type, filter_method); ++ ++ + // write icc profile + #if defined(PNG_iCCP_SUPPORTED) + if (gimp_image_has_icc_profile (image_ID, ICC_IMAGE_PROFILE)) { +@@ -970,10 +990,10 @@ + ICC_IMAGE_PROFILE); + png_set_iCCP (pp, info, + gimp_image_get_icc_profile_description (image_ID, ICC_IMAGE_PROFILE), +- 0, buffer, size); ++ 0, (png_const_bytep)buffer, size); + printf ("%s:%d %s() embedd icc profile \"%s\"\n", + __FILE__,__LINE__,__func__, +- info->iccp_name); ++ (char *)iccp_name); + } + #endif + +@@ -1039,13 +1059,13 @@ + * Convert unpacked pixels to packed if necessary + */ + +- if (info->color_type == PNG_COLOR_TYPE_PALETTE && info->bit_depth < 8) ++ if (color_type == PNG_COLOR_TYPE_PALETTE && bit_depth < 8) + png_set_packing(pp); + + /* Set swapping for 16 bit per sample images */ + + #ifndef WORDS_BIGENDIAN +- if (info->bit_depth == 16) ++ if (bit_depth == 16) + png_set_swap(pp); + #endif + +@@ -1063,6 +1083,7 @@ + + gimp_pixel_rgn_init(&pixel_rgn, drawable, 0, 0, drawable->width, + drawable->height, FALSE, FALSE); ++ height=png_get_image_height(pp, info); + + for (pass = 0; pass < num_passes; pass ++) + { +@@ -1077,7 +1098,7 @@ + num = end - begin; + + gimp_pixel_rgn_get_rect (&pixel_rgn, pixel, 0, begin, drawable->width, num); +- if (info->valid & PNG_INFO_tRNS) { ++ if (png_get_valid(pp, info, PNG_INFO_tRNS)) { + for (i = 0; i < num; ++i) { + fixed= pixels[i]; + for (k = 0; k < drawable->width; ++k) { +@@ -1085,7 +1106,7 @@ + } + } + /* Forgot this case before, what if there are too many colors? */ +- } else if (info->valid & PNG_INFO_PLTE && bpp == 2) { ++ } else if (png_get_valid(pp, info, PNG_INFO_PLTE) && bpp == 2) { + for (i = 0; i < num; ++i) { + fixed= pixels[i]; + for (k = 0; k < drawable->width; ++k) { +@@ -1097,7 +1118,6 @@ + png_write_rows (pp, pixels, num); +- + gimp_progress_update (((double)pass + (double)end / +- (double)info->height) / (double)num_passes); ++ (double)height) / (double)num_passes); + }; + }; + diff --git a/artistic/cinepaint-lts/cinepaint.install b/artistic/cinepaint-lts/cinepaint.install new file mode 100644 index 000000000..5e5cfef4d --- /dev/null +++ b/artistic/cinepaint-lts/cinepaint.install @@ -0,0 +1,11 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + update-desktop-database -q +} diff --git a/artistic/spnavcfg/PKGBUILD b/artistic/spnavcfg/PKGBUILD index df9027bc5..cbea06d01 100644 --- a/artistic/spnavcfg/PKGBUILD +++ b/artistic/spnavcfg/PKGBUILD @@ -4,16 +4,17 @@ pkgname=spnavcfg pkgver=0.2.1 pkgrel=1 -pkgdesc="The spacenav project provides a free, compatible alternative, to the proprietary 3Dconnexion device driver and SDK, for their 3D input devices (called 'space navigator', 'space pilot', 'space traveller', etc)." -arch=('i686' 'x86_64' 'mips64el') -url="http://spacenav.sourceforge.net/" -license=('GPL') -depends=('gtk2') +pkgdesc='A libre version of 3Dconnexion'\''s 3D input device drivers configuration' +arch=(i686 x86_64 mips64el) +url=http://spacenav.sourceforge.net/ +license=(GPL) +depends=(gtk2) source=(http://downloads.sourceforge.net/spacenav/$pkgname-$pkgver.tar.gz) -md5sums=('d20cf09515d1e39fd04877a00a2023b5') +sha512sums=(8cda7e8c9c2aa0875c6cf19e96ec47b9492acdcb110e9845f278ede44bee733876a56e2aa2d1198f54d8fecb978fcfe0a61e8f7b7fe19c2754eceec957172e34) build() { cd $srcdir/$pkgname-$pkgver + sed -i -e 's/$(LDFLAGS)/$(LDFLAGS) -lX11/' Makefile.in ./configure --prefix=$pkgdir/usr make || return 1 make DESTDIR=$pkgdir install || return 1 |