diff options
| -rw-r--r-- | cdrtools/PKGBUILD | 4 | ||||
| -rw-r--r-- | dzlad/PKGBUILD | 14 | ||||
| -rw-r--r-- | firefox-nightly/PKGBUILD | 2 | ||||
| -rw-r--r-- | flvstreamer/PKGBUILD | 8 | ||||
| -rwxr-xr-x[-rw-r--r--] | gecko-mediaplayer-svn/PKGBUILD | 2 | ||||
| -rw-r--r-- | gnome-mplayer-svn/PKGBUILD | 2 | ||||
| -rw-r--r-- | inxi/PKGBUILD | 2 | ||||
| -rw-r--r-- | libpng12/PKGBUILD | 45 | ||||
| -rw-r--r-- | libpng12/libpng-1.2.43-apng.patch | 1653 | ||||
| -rw-r--r-- | mozplugger/PKGBUILD | 31 | ||||
| -rw-r--r-- | mozplugger/mozplugger.install | 15 | ||||
| -rw-r--r-- | mpd-git/PKGBUILD | 2 | ||||
| -rw-r--r-- | mumble-git/PKGBUILD | 4 | ||||
| -rw-r--r-- | smplayer-svn/PKGBUILD | 27 | ||||
| -rw-r--r-- | swaks/PKGBUILD | 21 | ||||
| -rw-r--r-- | thunar-notrash/PKGBUILD | 31 | ||||
| -rw-r--r-- | virtualbox_bin/10-vboxdrv.rules | 3 | ||||
| -rw-r--r-- | virtualbox_bin/PKGBUILD | 104 | ||||
| -rw-r--r-- | virtualbox_bin/vbox.install | 102 | ||||
| -rw-r--r-- | virtualbox_bin/vbox_build_module | 5 | ||||
| -rw-r--r-- | virtualbox_bin/virtualbox.install | 100 | ||||
| -rw-r--r-- | wireshark-cli/PKGBUILD | 6 | ||||
| -rw-r--r-- | yaourt/PKGBUILD | 25 | ||||
| -rw-r--r-- | yaourt/yaourt.install | 14 | ||||
| -rw-r--r-- | zsh-yaourt/PKGBUILD | 18 | ||||
| -rw-r--r-- | zsh-yaourt/_yaourt | 344 |
26 files changed, 2528 insertions, 56 deletions
diff --git a/cdrtools/PKGBUILD b/cdrtools/PKGBUILD index 19fc892..3c23356 100644 --- a/cdrtools/PKGBUILD +++ b/cdrtools/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> # Contributor: Tuxbubling <tuxbubling@jabber.fr>, alejandronova pkgname=cdrtools -pkgver=2.01.01a76 +pkgver=2.01.01a79 pkgrel=1 pkgdesc="Original cdrtools, supporting CD, DVD and BluRay burning" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ provides=('cdrkit') backup=('etc/default/cdrecord' 'etc/default/rscsi') install=cdrtools.install source=(http://ftp.berlios.de/pub/cdrecord/alpha/cdrtools-$pkgver.tar.gz) -md5sums=('1cc6e28c7eeee39d21dec5dfc5b851ef') +md5sums=('667d286693942b0bf61eaabbf54d09e2') build() { cd "$srcdir"/cdrtools-${pkgver%%a*} diff --git a/dzlad/PKGBUILD b/dzlad/PKGBUILD index 8e6404f..a3585d8 100644 --- a/dzlad/PKGBUILD +++ b/dzlad/PKGBUILD @@ -2,17 +2,15 @@ # Contributor: lolilolicon <lolilolicon#gmail#com> pkgname=dzlad -pkgver=0.1.1 -pkgrel=2 +pkgver=0.1.2 +pkgrel=1 pkgdesc="Dzlad helps you do some AUR tasks" arch=(any) -url="http://github.com/lolilolicon/dzlad" +url="http://lolilolicon.github.com/dzlad" license=('MIT') depends=(ruby) -provides=(dzlad-git) -conflicts=(dzlad-git) -source=(http://cloud.github.com/downloads/lolilolicon/dzlad/$pkgname-$pkgver.tar.bz2) -md5sums=('a96650e52e087a83ad0653c37ad7c497') +source=(http://cloud.github.com/downloads/lolilolicon/$pkgname/$pkgname-$pkgver.tar.bz2) +md5sums=('061b864b84028c725968381bea009d83') build() { cd "$srcdir/$pkgname-$pkgver" @@ -22,7 +20,7 @@ build() { install -Dm 644 lib/dzlad.rb "$pkgdir/usr/lib/ruby/site_ruby/1.9.1/" install -Dm 755 bin/dzlad "$pkgdir/usr/bin/dzlad" - install -Dm 644 LICENSE "$pkgdir/usr/share/license/$pkgname/LICENSE" + install -Dm 644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } # vim:set ts=2 sw=2 et: diff --git a/firefox-nightly/PKGBUILD b/firefox-nightly/PKGBUILD index 0a7dd7b..a8cb620 100644 --- a/firefox-nightly/PKGBUILD +++ b/firefox-nightly/PKGBUILD @@ -7,7 +7,7 @@ license=('MPL' 'GPL' 'LGPL') pkgname=firefox-nightly pkgdesc='Standalone web browser from mozilla.org, nightly build.' url='http://www.mozilla.org/projects/firefox' -pkgver=3.7a4pre +pkgver=3.7a5pre pkgrel=$(date +%Y_%m_%d_%T) source=( 'firefox-nightly.desktop' 'firefox-nightly-safe.desktop' ) diff --git a/flvstreamer/PKGBUILD b/flvstreamer/PKGBUILD index 0ee7f55..d9f3373 100644 --- a/flvstreamer/PKGBUILD +++ b/flvstreamer/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: Stefan Husmann <stefan-husmann@t-online.de> pkgname=flvstreamer -pkgver=1.9 +pkgver=2.1c1 pkgrel=1 pkgdesc="Open source command-line RTMP client" url="http://savannah.nongnu.org/projects/flvstreamer" @@ -8,14 +8,14 @@ arch=('i686' 'x86_64') license=('GPL') depends=('gcc-libs') source=("http://mirrors.zerg.biz/nongnu/flvstreamer/source/$pkgname-$pkgver.tar.gz") -md5sums=('8024c2a44b4fe9e39d1eec9b58f4da9e') +md5sums=('4866387328ad89c957af90a2478e5556') build() { - cd $srcdir/$pkgname-$pkgver + cd $srcdir/$pkgname make $pkgname || return 1 make streams || return 1 } package() { - cd $srcdir/$pkgname-$pkgver + cd $srcdir/$pkgname install -Dm755 $pkgname $pkgdir/usr/bin/$pkgname || return 1 install -Dm755 streams $pkgdir/usr/bin/streams || return 1 }
\ No newline at end of file diff --git a/gecko-mediaplayer-svn/PKGBUILD b/gecko-mediaplayer-svn/PKGBUILD index 5a55a92..3e42631 100644..100755 --- a/gecko-mediaplayer-svn/PKGBUILD +++ b/gecko-mediaplayer-svn/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: evr <evanroman at gmail> # Contributor: Jorge Mokross <mokross@gmail.com> pkgname=gecko-mediaplayer-svn -pkgver=345 +pkgver=388 pkgrel=1 pkgdesc="A browser plugin that uses GNOME Mplayer." url="http://kdekorte.googlepages.com/gecko-mediaplayer" diff --git a/gnome-mplayer-svn/PKGBUILD b/gnome-mplayer-svn/PKGBUILD index 5cd2632..650d557 100644 --- a/gnome-mplayer-svn/PKGBUILD +++ b/gnome-mplayer-svn/PKGBUILD @@ -1,7 +1,7 @@ # Maintainter: evr <evanroman at gmail> # Contributor: Jorge Mokross <mokross@gmail.com> pkgname=gnome-mplayer-svn -pkgver=1606 +pkgver=1708 pkgrel=1 pkgdesc="A simple Mplayer GUI" url="http://kdekorte.googlepages.com/gnomemplayer" diff --git a/inxi/PKGBUILD b/inxi/PKGBUILD index 0bba47e..f3ff5dc 100644 --- a/inxi/PKGBUILD +++ b/inxi/PKGBUILD @@ -1,6 +1,6 @@ # Contributor: Florian Pritz <f-p@gmx.at> pkgname=inxi -pkgver=1.4.8 +pkgver=1.4.9 pkgrel=1 pkgdesc="script to get system information" arch=('any') diff --git a/libpng12/PKGBUILD b/libpng12/PKGBUILD new file mode 100644 index 0000000..a3a1e85 --- /dev/null +++ b/libpng12/PKGBUILD @@ -0,0 +1,45 @@ +# $Id: PKGBUILD 58551 2009-11-08 22:37:12Z eric $ +# Maintainer: dorphell <dorphell@archlinux.org> +# Maintainer: Travis Willard <travis@archlinux.org> +# Maintainer: Douglas Soares de Andrade <douglas@archlinux.org> + +pkgname=libpng12 +_realname=libpng +pkgver=1.2.43 +pkgrel=1 +pkgdesc="A collection of routines used to create PNG format graphics files" +arch=('i686' 'x86_64') +url="http://www.libpng.org/pub/png/libpng.html" +license=('custom') +depends=('zlib') +options=('!libtool') +source=("http://downloads.sourceforge.net/sourceforge/${_realname}/${_realname}-${pkgver}.tar.bz2" + "http://littlesvr.ca/apng/diff/libpng-1.2.43-apng.patch") +md5sums=('976909556e6613804d810405c1f72ce6' + '0152337e035e9c767ca92521e3127502') + + +build() { + cd "${srcdir}/${_realname}-${pkgver}" + + # Add animated PNG (apng) support + # see http://hp.vector.co.jp/authors/VA013651/freeSoftware/apng.html + patch -Np0 -i "${srcdir}/libpng-1.2.43-apng.patch" || return 1 + + libtoolize --force --copy || return 1 + aclocal || return 1 + autoconf || return 1 + automake --add-missing || return 1 + + ./configure --prefix=/usr || return 1 + make ECHO=echo || return 1 + make ECHO=echo DESTDIR="${pkgdir}" install || return 1 + + #cd contrib/pngminus + #make ECHO=echo PNGLIB="-L${pkgdir}/usr/lib -lpng" -f makefile.std png2pnm pnm2png + #install -m755 png2pnm pnm2png "${pkgdir}/usr/bin/" + #install -D -m644 ../../LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" || return 1 + # only libs needed + rm -rf ${pkgdir}/usr/lib/{libpng.so,libpng.a,pkgconfig} + rm -rf ${pkgdir}/usr/{include,share,bin} +} diff --git a/libpng12/libpng-1.2.43-apng.patch b/libpng12/libpng-1.2.43-apng.patch new file mode 100644 index 0000000..00b1c24 --- /dev/null +++ b/libpng12/libpng-1.2.43-apng.patch @@ -0,0 +1,1653 @@ +Index: pngread.c
+===================================================================
+--- pngread.c
++++ pngread.c
+@@ -437,6 +437,11 @@
+ #ifdef PNG_READ_zTXt_SUPPORTED
+ PNG_CONST PNG_zTXt;
+ #endif
++#ifdef PNG_READ_APNG_SUPPORTED
++ PNG_CONST PNG_acTL;
++ PNG_CONST PNG_fcTL;
++ PNG_CONST PNG_fdAT;
++#endif
+ #endif /* PNG_USE_LOCAL_ARRAYS */
+ png_uint_32 length = png_read_chunk_header(png_ptr);
+ PNG_CONST png_bytep chunk_name = png_ptr->chunk_name;
+@@ -481,6 +486,9 @@
+ !(png_ptr->mode & PNG_HAVE_PLTE))
+ png_error(png_ptr, "Missing PLTE before IDAT");
+
++#ifdef PNG_READ_APNG_SUPPORTED
++ png_have_info(png_ptr, info_ptr);
++#endif
+ png_ptr->idat_size = length;
+ png_ptr->mode |= PNG_HAVE_IDAT;
+ break;
+@@ -553,12 +561,97 @@
+ else if (!png_memcmp(chunk_name, png_iTXt, 4))
+ png_handle_iTXt(png_ptr, info_ptr, length);
+ #endif
++#ifdef PNG_READ_APNG_SUPPORTED
++ else if (!png_memcmp(chunk_name, png_acTL, 4))
++ png_handle_acTL(png_ptr, info_ptr, length);
++ else if (!png_memcmp(chunk_name, png_fcTL, 4))
++ png_handle_fcTL(png_ptr, info_ptr, length);
++ else if (!png_memcmp(chunk_name, png_fdAT, 4))
++ png_handle_fdAT(png_ptr, info_ptr, length);
++#endif
+ else
+ png_handle_unknown(png_ptr, info_ptr, length);
+ }
+ }
+ #endif /* PNG_SEQUENTIAL_READ_SUPPORTED */
+
++#ifdef PNG_READ_APNG_SUPPORTED
++void PNGAPI
++png_read_frame_head(png_structp png_ptr, png_infop info_ptr)
++{
++ png_byte have_chunk_after_DAT; /* after IDAT or after fdAT */
++
++ png_debug(0, "Reading frame head");
++
++ if (!(png_ptr->mode & PNG_HAVE_acTL))
++ png_error(png_ptr, "attempt to png_read_frame_head() but "
++ "no acTL present");
++
++ /* do nothing for the main IDAT */
++ if (png_ptr->num_frames_read == 0)
++ return;
++
++ png_crc_finish(png_ptr, 0); /* CRC from last IDAT or fdAT chunk */
++
++ png_read_reset(png_ptr);
++ png_ptr->mode &= ~PNG_HAVE_fcTL;
++
++ have_chunk_after_DAT = 0;
++ for (;;)
++ {
++#ifdef PNG_USE_LOCAL_ARRAYS
++ PNG_IDAT;
++ PNG_fdAT;
++ PNG_fcTL;
++#endif
++ png_byte chunk_length[4];
++ png_uint_32 length;
++
++ png_read_data(png_ptr, chunk_length, 4);
++ length = png_get_uint_31(png_ptr, chunk_length);
++
++ png_reset_crc(png_ptr);
++ png_crc_read(png_ptr, png_ptr->chunk_name, 4);
++
++ if (!png_memcmp(png_ptr->chunk_name, png_IDAT, 4))
++ {
++ /* discard trailing IDATs for the first frame */
++ if (have_chunk_after_DAT || png_ptr->num_frames_read > 1)
++ png_error(png_ptr, "png_read_frame_head(): out of place IDAT");
++ png_crc_finish(png_ptr, length);
++ }
++ else if (!png_memcmp(png_ptr->chunk_name, png_fcTL, 4))
++ {
++ png_handle_fcTL(png_ptr, info_ptr, length);
++ have_chunk_after_DAT = 1;
++ }
++ else if (!png_memcmp(png_ptr->chunk_name, png_fdAT, 4))
++ {
++ png_ensure_sequence_number(png_ptr, length);
++
++ /* discard trailing fdATs for frames other than the first */
++ if (!have_chunk_after_DAT && png_ptr->num_frames_read > 1)
++ png_crc_finish(png_ptr, length - 4);
++ else if(png_ptr->mode & PNG_HAVE_fcTL)
++ {
++ png_ptr->idat_size = length - 4;
++ png_ptr->mode |= PNG_HAVE_IDAT;
++
++ break;
++ }
++ else
++ png_error(png_ptr, "png_read_frame_head(): out of place fdAT");
++ }
++ else
++ {
++ png_warning(png_ptr, "Skipped (ignored) a chunk "
++ "between APNG chunks");
++ png_crc_finish(png_ptr, length);
++ }
++ }
++}
++#endif /* PNG_READ_APNG_SUPPORTED */
++
+ /* Optional call to update the users info_ptr structure */
+ void PNGAPI
+ png_read_update_info(png_structp png_ptr, png_infop info_ptr)
+@@ -599,6 +692,10 @@
+ png_read_row(png_structp png_ptr, png_bytep row, png_bytep dsp_row)
+ {
+ PNG_CONST PNG_IDAT;
++#ifdef PNG_READ_APNG_SUPPORTED
++ PNG_CONST PNG_fdAT;
++ PNG_CONST PNG_IEND;
++#endif
+ PNG_CONST int png_pass_dsp_mask[7] = {0xff, 0x0f, 0xff, 0x33, 0xff, 0x55,
+ 0xff};
+ PNG_CONST int png_pass_mask[7] = {0x80, 0x08, 0x88, 0x22, 0xaa, 0x55, 0xff};
+@@ -734,13 +831,39 @@
+ {
+ if (!(png_ptr->zstream.avail_in))
+ {
+- while (!png_ptr->idat_size)
++ png_uint_32 bytes_to_skip = 0;
++
++ while (!png_ptr->idat_size || bytes_to_skip != 0)
+ {
+- png_crc_finish(png_ptr, 0);
++ png_crc_finish(png_ptr, bytes_to_skip);
++ bytes_to_skip = 0;
+
+ png_ptr->idat_size = png_read_chunk_header(png_ptr);
++#ifdef PNG_READ_APNG_SUPPORTED
++ if (png_ptr->num_frames_read == 0)
++ {
++#endif
+ if (png_memcmp(png_ptr->chunk_name, png_IDAT, 4))
+ png_error(png_ptr, "Not enough image data");
++#ifdef PNG_READ_APNG_SUPPORTED
++ }
++ else
++ {
++ if (!png_memcmp(png_ptr->chunk_name, png_IEND, 4))
++ png_error(png_ptr, "Not enough image data");
++ if (png_memcmp(png_ptr->chunk_name, png_fdAT, 4))
++ {
++ png_warning(png_ptr, "Skipped (ignored) a chunk "
++ "between APNG chunks");
++ bytes_to_skip = png_ptr->idat_size;
++ continue;
++ }
++
++ png_ensure_sequence_number(png_ptr, png_ptr->idat_size);
++
++ png_ptr->idat_size -= 4;
++ }
++#endif
+ }
+ png_ptr->zstream.avail_in = (uInt)png_ptr->zbuf_size;
+ png_ptr->zstream.next_in = png_ptr->zbuf;
+@@ -758,6 +881,9 @@
+ png_error(png_ptr, "Extra compressed data");
+ png_ptr->mode |= PNG_AFTER_IDAT;
+ png_ptr->flags |= PNG_FLAG_ZLIB_FINISHED;
++#ifdef PNG_READ_APNG_SUPPORTED
++ png_ptr->num_frames_read++;
++#endif
+ break;
+ }
+ if (ret != Z_OK)
+@@ -1015,6 +1141,11 @@
+ #ifdef PNG_READ_zTXt_SUPPORTED
+ PNG_CONST PNG_zTXt;
+ #endif
++#ifdef PNG_READ_APNG_SUPPORTED
++ PNG_CONST PNG_acTL;
++ PNG_CONST PNG_fcTL;
++ PNG_CONST PNG_fdAT;
++#endif
+ #endif /* PNG_USE_LOCAL_ARRAYS */
+ png_uint_32 length = png_read_chunk_header(png_ptr);
+ PNG_CONST png_bytep chunk_name = png_ptr->chunk_name;
+@@ -1115,6 +1246,14 @@
+ else if (!png_memcmp(chunk_name, png_iTXt, 4))
+ png_handle_iTXt(png_ptr, info_ptr, length);
+ #endif
++#ifdef PNG_READ_APNG_SUPPORTED
++ else if (!png_memcmp(chunk_name, png_acTL, 4))
++ png_handle_acTL(png_ptr, info_ptr, length);
++ else if (!png_memcmp(chunk_name, png_fcTL, 4))
++ png_handle_fcTL(png_ptr, info_ptr, length);
++ else if (!png_memcmp(chunk_name, png_fdAT, 4))
++ png_handle_fdAT(png_ptr, info_ptr, length);
++#endif
+ else
+ png_handle_unknown(png_ptr, info_ptr, length);
+ } while (!(png_ptr->mode & PNG_HAVE_IEND));
+Index: pngget.c
+===================================================================
+--- pngget.c
++++ pngget.c
+@@ -842,6 +842,167 @@
+ }
+ #endif
+
++#ifdef PNG_APNG_SUPPORTED
++png_uint_32 PNGAPI
++png_get_acTL(png_structp png_ptr, png_infop info_ptr,
++ png_uint_32 *num_frames, png_uint_32 *num_plays)
++{
++ png_debug1(1, "in %s retrieval function", "acTL");
++
++ if (png_ptr != NULL && info_ptr != NULL &&
++ (info_ptr->valid & PNG_INFO_acTL) &&
++ num_frames != NULL && num_plays != NULL)
++ {
++ *num_frames = info_ptr->num_frames;
++ *num_plays = info_ptr->num_plays;
++ return (1);
++ }
++
++ return (0);
++}
++
++png_uint_32 PNGAPI
++png_get_num_frames(png_structp png_ptr, png_infop info_ptr)
++{
++ png_debug(1, "in png_get_num_frames()");
++
++ if (png_ptr != NULL && info_ptr != NULL)
++ return (info_ptr->num_frames);
++ return (0);
++}
++
++png_uint_32 PNGAPI
++png_get_num_plays(png_structp png_ptr, png_infop info_ptr)
++{
++ png_debug(1, "in png_get_num_plays()");
++
++ if (png_ptr != NULL && info_ptr != NULL)
++ return (info_ptr->num_plays);
++ return (0);
++}
++
++png_uint_32 PNGAPI
++png_get_next_frame_fcTL(png_structp png_ptr, png_infop info_ptr,
++ png_uint_32 *width, png_uint_32 *height,
++ png_uint_32 *x_offset, png_uint_32 *y_offset,
++ png_uint_16 *delay_num, png_uint_16 *delay_den,
++ png_byte *dispose_op, png_byte *blend_op)
++{
++ png_debug1(1, "in %s retrieval function", "fcTL");
++
++ if (png_ptr != NULL && info_ptr != NULL &&
++ (info_ptr->valid & PNG_INFO_fcTL) &&
++ width != NULL && height != NULL &&
++ x_offset != NULL && x_offset != NULL &&
++ delay_num != NULL && delay_den != NULL &&
++ dispose_op != NULL && blend_op != NULL)
++ {
++ *width = info_ptr->next_frame_width;
++ *height = info_ptr->next_frame_height;
++ *x_offset = info_ptr->next_frame_x_offset;
++ *y_offset = info_ptr->next_frame_y_offset;
++ *delay_num = info_ptr->next_frame_delay_num;
++ *delay_den = info_ptr->next_frame_delay_den;
++ *dispose_op = info_ptr->next_frame_dispose_op;
++ *blend_op = info_ptr->next_frame_blend_op;
++ return (1);
++ }
++
++ return (0);
++}
++
++png_uint_32 PNGAPI
++png_get_next_frame_width(png_structp png_ptr, png_infop info_ptr)
++{
++ png_debug(1, "in png_get_next_frame_width()");
++
++ if (png_ptr != NULL && info_ptr != NULL)
++ return (info_ptr->next_frame_width);
++ return (0);
++}
++
++png_uint_32 PNGAPI
++png_get_next_frame_height(png_structp png_ptr, png_infop info_ptr)
++{
++ png_debug(1, "in png_get_next_frame_height()");
++
++ if (png_ptr != NULL && info_ptr != NULL)
++ return (info_ptr->next_frame_height);
++ return (0);
++}
++
++png_uint_32 PNGAPI
++png_get_next_frame_x_offset(png_structp png_ptr, png_infop info_ptr)
++{
++ png_debug(1, "in png_get_next_frame_x_offset()");
++
++ if (png_ptr != NULL && info_ptr != NULL)
++ return (info_ptr->next_frame_x_offset);
++ return (0);
++}
++
++png_uint_32 PNGAPI
++png_get_next_frame_y_offset(png_structp png_ptr, png_infop info_ptr)
++{
++ png_debug(1, "in png_get_next_frame_y_offset()");
++
++ if (png_ptr != NULL && info_ptr != NULL)
++ return (info_ptr->next_frame_y_offset);
++ return (0);
++}
++
++png_uint_16 PNGAPI
++png_get_next_frame_delay_num(png_structp png_ptr, png_infop info_ptr)
++{
++ png_debug(1, "in png_get_next_frame_delay_num()");
++
++ if (png_ptr != NULL && info_ptr != NULL)
++ return (info_ptr->next_frame_delay_num);
++ return (0);
++}
++
++png_uint_16 PNGAPI
++png_get_next_frame_delay_den(png_structp png_ptr, png_infop info_ptr)
++{
++ png_debug(1, "in png_get_next_frame_delay_den()");
++
++ if (png_ptr != NULL && info_ptr != NULL)
++ return (info_ptr->next_frame_delay_den);
++ return (0);
++}
++
++png_byte PNGAPI
++png_get_next_frame_dispose_op(png_structp png_ptr, png_infop info_ptr)
++{
++ png_debug(1, "in png_get_next_frame_dispose_op()");
++
++ if (png_ptr != NULL && info_ptr != NULL)
++ return (info_ptr->next_frame_dispose_op);
++ return (0);
++}
++
++png_byte PNGAPI
++png_get_next_frame_blend_op(png_structp png_ptr, png_infop info_ptr)
++{
++ png_debug(1, "in png_get_next_frame_blend_op()");
++
++ if (png_ptr != NULL && info_ptr != NULL)
++ return (info_ptr->next_frame_blend_op);
++ return (0);
++}
++
++png_byte PNGAPI
++png_get_first_frame_is_hidden(png_structp png_ptr, png_infop info_ptr)
++{
++ png_debug(1, "in png_first_frame_is_hidden()");
++
++ if (png_ptr != NULL)
++ return (png_byte)(png_ptr->apng_flags & PNG_FIRST_FRAME_HIDDEN);
++
++ return 0;
++}
++#endif /* PNG_APNG_SUPPORTED */
++
+ #ifdef PNG_UNKNOWN_CHUNKS_SUPPORTED
+ png_uint_32 PNGAPI
+ png_get_unknown_chunks(png_structp png_ptr, png_infop info_ptr,
+Index: png.c
+===================================================================
+--- png.c
++++ png.c
+@@ -56,6 +56,11 @@
+ PNG_tIME;
+ PNG_tRNS;
+ PNG_zTXt;
++#ifdef PNG_APNG_SUPPORTED
++PNG_acTL;
++PNG_fcTL;
++PNG_fdAT;
++#endif
+
+ #ifdef PNG_READ_SUPPORTED
+ /* Arrays to facilitate easy interlacing - use pass (0 - 6) as index */
+Index: png.h
+===================================================================
+--- png.h
++++ png.h
+@@ -1038,6 +1038,19 @@
+ png_fixed_point int_y_blue PNG_DEPSTRUCT;
+ #endif
+
++#ifdef PNG_APNG_SUPPORTED
++ png_uint_32 num_frames; /* including default image */
++ png_uint_32 num_plays;
++ png_uint_32 next_frame_width;
++ png_uint_32 next_frame_height;
++ png_uint_32 next_frame_x_offset;
++ png_uint_32 next_frame_y_offset;
++ png_uint_16 next_frame_delay_num;
++ png_uint_16 next_frame_delay_den;
++ png_byte next_frame_dispose_op;
++ png_byte next_frame_blend_op;
++#endif
++
+ } png_info;
+
+ typedef png_info FAR * png_infop;
+@@ -1139,6 +1152,10 @@
+ #define PNG_INFO_sPLT 0x2000 /* ESR, 1.0.6 */
+ #define PNG_INFO_sCAL 0x4000 /* ESR, 1.0.6 */
+ #define PNG_INFO_IDAT 0x8000L /* ESR, 1.0.6 */
++#ifdef PNG_APNG_SUPPORTED
++#define PNG_INFO_acTL 0x10000L
++#define PNG_INFO_fcTL 0x20000L
++#endif
+
+ /* This is used for the transformation routines, as some of them
+ * change these values for the row. It also should enable using
+@@ -1179,6 +1196,10 @@
+ typedef void (PNGAPI *png_progressive_end_ptr) PNGARG((png_structp, png_infop));
+ typedef void (PNGAPI *png_progressive_row_ptr) PNGARG((png_structp, png_bytep,
+ png_uint_32, int));
++#ifdef PNG_APNG_SUPPORTED
++typedef void (PNGAPI *png_progressive_frame_ptr) PNGARG((png_structp,
++ png_uint_32));
++#endif
+ #endif
+
+ #if defined(PNG_READ_USER_TRANSFORM_SUPPORTED) || \
+@@ -1524,6 +1545,39 @@
+ png_uint_32 user_height_max PNG_DEPSTRUCT;
+ #endif
+
++#ifdef PNG_APNG_SUPPORTED
++ png_uint_32 apng_flags;
++ png_uint_32 next_seq_num; /* next fcTL/fdAT chunk sequence number */
++ png_uint_32 first_frame_width;
++ png_uint_32 first_frame_height;
++
++#ifdef PNG_READ_APNG_SUPPORTED
++ png_uint_32 num_frames_read; /* incremented after all image data of */
++ /* a frame is read */
++#ifdef PNG_PROGRESSIVE_READ_SUPPORTED
++ png_progressive_frame_ptr frame_info_fn; /* frame info read callback */
++ png_progressive_frame_ptr frame_end_fn; /* frame data read callback */
++#endif
++#endif
++
++#ifdef PNG_WRITE_APNG_SUPPORTED
++ png_uint_32 num_frames_to_write;
++ png_uint_32 num_frames_written;
++#endif
++
++/* For png_struct.apng_flags: */
++#define PNG_FIRST_FRAME_HIDDEN 0x0001
++
++/* dispose_op flags from inside fcTL */
++#define PNG_DISPOSE_OP_NONE 0x00
++#define PNG_DISPOSE_OP_BACKGROUND 0x01
++#define PNG_DISPOSE_OP_PREVIOUS 0x02
++
++/* blend_op flags from inside fcTL */
++#define PNG_BLEND_OP_SOURCE 0x00
++#define PNG_BLEND_OP_OVER 0x01
++#endif /* PNG_APNG_SUPPORTED */
++
+ /* New member added in libpng-1.0.25 and 1.2.17 */
+ #ifdef PNG_UNKNOWN_CHUNKS_SUPPORTED
+ /* Storage for unknown chunk that the library doesn't recognize. */
+@@ -1858,6 +1912,18 @@
+ extern PNG_EXPORT(void,png_write_image) PNGARG((png_structp png_ptr,
+ png_bytepp image));
+
++#ifdef PNG_WRITE_APNG_SUPPORTED
++extern PNG_EXPORT (void,png_write_frame_head) PNGARG((png_structp png_ptr,
++ png_infop png_info, png_bytepp row_pointers,
++ png_uint_32 width, png_uint_32 height,
++ png_uint_32 x_offset, png_uint_32 y_offset,
++ png_uint_16 delay_num, png_uint_16 delay_den, png_byte dispose_op,
++ png_byte blend_op));
++
++extern PNG_EXPORT (void,png_write_frame_tail) PNGARG((png_structp png_ptr,
++ png_infop png_info));
++#endif
++
+ /* Writes the end of the PNG file. */
+ extern PNG_EXPORT(void,png_write_end) PNGARG((png_structp png_ptr,
+ png_infop info_ptr));
+@@ -2111,6 +2177,11 @@
+ png_voidp progressive_ptr,
+ png_progressive_info_ptr info_fn, png_progressive_row_ptr row_fn,
+ png_progressive_end_ptr end_fn));
++#ifdef PNG_READ_APNG_SUPPORTED
++extern PNG_EXPORT(void,png_set_progressive_frame_fn) PNGARG((png_structp png_ptr,
++ png_progressive_frame_ptr frame_info_fn,
++ png_progressive_frame_ptr frame_end_fn));
++#endif
+
+ /* Returns the user pointer associated with the push read functions */
+ extern PNG_EXPORT(png_voidp,png_get_progressive_ptr)
+@@ -2551,6 +2622,59 @@
+ #endif
+ #endif /* PNG_sCAL_SUPPORTED || PNG_WRITE_sCAL_SUPPORTED */
+
++#ifdef PNG_APNG_SUPPORTED
++extern PNG_EXPORT(png_uint_32,png_get_acTL) PNGARG((png_structp png_ptr,
++ png_infop info_ptr, png_uint_32 *num_frames, png_uint_32 *num_plays));
++extern PNG_EXPORT(png_uint_32,png_set_acTL) PNGARG((png_structp png_ptr,
++ png_infop info_ptr, png_uint_32 num_frames, png_uint_32 num_plays));
++extern PNG_EXPORT(png_uint_32,png_get_num_frames) PNGARG((png_structp png_ptr,
++ png_infop info_ptr));
++extern PNG_EXPORT(png_uint_32,png_get_num_plays)
++ PNGARG((png_structp png_ptr, png_infop info_ptr));
++
++extern PNG_EXPORT(png_uint_32,png_get_next_frame_fcTL)
++ PNGARG((png_structp png_ptr, png_infop info_ptr, png_uint_32 *width,
++ png_uint_32 *height, png_uint_32 *x_offset, png_uint_32 *y_offset,
++ png_uint_16 *delay_num, png_uint_16 *delay_den, png_byte *dispose_op,
++ png_byte *blend_op));
++extern PNG_EXPORT(png_uint_32,png_set_next_frame_fcTL)
++ PNGARG((png_structp png_ptr, png_infop info_ptr, png_uint_32 width,
++ png_uint_32 height, png_uint_32 x_offset, png_uint_32 y_offset,
++ png_uint_16 delay_num, png_uint_16 delay_den, png_byte dispose_op,
++ png_byte blend_op));
++extern PNG_EXPORT(void,png_ensure_fcTL_is_valid)
++ PNGARG((png_structp png_ptr,
++ png_uint_32 width, png_uint_32 height,
++ png_uint_32 x_offset, png_uint_32 y_offset,
++ png_uint_16 delay_num, png_uint_16 delay_den,
++ png_byte dispose_op, png_byte blend_op));
++extern PNG_EXPORT(png_uint_32,png_get_next_frame_width)
++ PNGARG((png_structp png_ptr, png_infop info_ptr));
++extern PNG_EXPORT(png_uint_32,png_get_next_frame_height)
++ PNGARG((png_structp png_ptr, png_infop info_ptr));
++extern PNG_EXPORT(png_uint_32,png_get_next_frame_x_offset)
++ PNGARG((png_structp png_ptr, png_infop info_ptr));
++extern PNG_EXPORT(png_uint_32,png_get_next_frame_y_offset)
++ PNGARG((png_structp png_ptr, png_infop info_ptr));
++extern PNG_EXPORT(png_uint_16,png_get_next_frame_delay_num)
++ PNGARG((png_structp png_ptr, png_infop info_ptr));
++extern PNG_EXPORT(png_uint_16,png_get_next_frame_delay_den)
++ PNGARG((png_structp png_ptr, png_infop info_ptr));
++extern PNG_EXPORT(png_byte,png_get_next_frame_dispose_op)
++ PNGARG((png_structp png_ptr, png_infop info_ptr));
++extern PNG_EXPORT(png_byte,png_get_next_frame_blend_op)
++ PNGARG((png_structp png_ptr, png_infop info_ptr));
++extern PNG_EXPORT(png_byte,png_get_first_frame_is_hidden)
++ PNGARG((png_structp png_ptr, png_infop info_ptr));
++extern PNG_EXPORT(png_uint_32,png_set_first_frame_is_hidden)
++ PNGARG((png_structp png_ptr, png_infop info_ptr, png_byte is_hidden));
++#endif /* PNG_APNG_SUPPORTED */
++
++#ifdef PNG_READ_APNG_SUPPORTED
++extern PNG_EXPORT(void,png_read_frame_head) PNGARG((png_structp png_ptr,
++ png_infop info_ptr));
++#endif
++
+ #ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
+ /* Provide a list of chunks and how they are to be handled, if the built-in
+ handling or default unknown chunk handling is not desired. Any chunks not
+@@ -2915,6 +3039,10 @@
+ #define PNG_BACKGROUND_IS_GRAY 0x800
+ #define PNG_HAVE_PNG_SIGNATURE 0x1000
+ #define PNG_HAVE_CHUNK_AFTER_IDAT 0x2000 /* Have another chunk after IDAT */
++#ifdef PNG_APNG_SUPPORTED
++#define PNG_HAVE_acTL 0x4000
++#define PNG_HAVE_fcTL 0x8000L
++#endif
+
+ /* Flags for the transformations the PNG library does on the image data */
+ #define PNG_BGR 0x0001
+@@ -3057,6 +3185,11 @@
+ #define PNG_tIME png_byte png_tIME[5] = {116, 73, 77, 69, '\0'}
+ #define PNG_tRNS png_byte png_tRNS[5] = {116, 82, 78, 83, '\0'}
+ #define PNG_zTXt png_byte png_zTXt[5] = {122, 84, 88, 116, '\0'}
++#ifdef PNG_APNG_SUPPORTED
++#define PNG_acTL png_byte png_acTL[5] = { 97, 99, 84, 76, '\0'}
++#define PNG_fcTL png_byte png_fcTL[5] = {102, 99, 84, 76, '\0'}
++#define PNG_fdAT png_byte png_fdAT[5] = {102, 100, 65, 84, '\0'}
++#endif
+
+ #ifdef PNG_USE_GLOBAL_ARRAYS
+ PNG_EXPORT_VAR (png_byte FARDATA) png_IHDR[5];
+@@ -3080,6 +3213,11 @@
+ PNG_EXPORT_VAR (png_byte FARDATA) png_tIME[5];
+ PNG_EXPORT_VAR (png_byte FARDATA) png_tRNS[5];
+ PNG_EXPORT_VAR (png_byte FARDATA) png_zTXt[5];
++#ifdef PNG_APNG_SUPPORTED
++PNG_EXPORT_VAR (png_byte FARDATA) png_acTL[5];
++PNG_EXPORT_VAR (png_byte FARDATA) png_fcTL[5];
++PNG_EXPORT_VAR (png_byte FARDATA) png_fdAT[5];
++#endif
+ #endif /* PNG_USE_GLOBAL_ARRAYS */
+
+ #if defined(PNG_1_0_X) || defined (PNG_1_2_X)
+@@ -3362,6 +3500,17 @@
+ #endif
+ #endif
+
++#ifdef PNG_WRITE_APNG_SUPPORTED
++PNG_EXTERN void png_write_acTL PNGARG((png_structp png_ptr,
++ png_uint_32 num_frames, png_uint_32 num_plays));
++
++PNG_EXTERN void png_write_fcTL PNGARG((png_structp png_ptr,
++ png_uint_32 width, png_uint_32 height,
++ png_uint_32 x_offset, png_uint_32 y_offset,
++ png_uint_16 delay_num, png_uint_16 delay_den,
++ png_byte dispose_op, png_byte blend_op));
++#endif
++
+ /* Called when finished processing a row of data */
+ PNG_EXTERN void png_write_finish_row PNGARG((png_structp png_ptr)) PNG_PRIVATE;
+
+@@ -3414,6 +3563,20 @@
+ PNG_EXTERN void png_read_transform_info PNGARG((png_structp png_ptr,
+ png_infop info_ptr)) PNG_PRIVATE;
+
++#ifdef PNG_READ_APNG_SUPPORTED
++/* Private, reset some things to become ready for reading next frame */
++PNG_EXTERN void png_read_reset PNGARG((png_structp png_ptr));
++PNG_EXTERN void png_read_reinit PNGARG((png_structp png_ptr,
++ png_infop info_ptr));
++PNG_EXTERN void png_progressive_read_reset PNGARG((png_structp png_ptr));
++#endif
++#ifdef PNG_WRITE_APNG_SUPPORTED
++/* Private, reset some things to become ready for writing next frame */
++PNG_EXTERN void png_write_reset PNGARG((png_structp png_ptr));
++PNG_EXTERN void png_write_reinit PNGARG((png_structp png_ptr,
++ png_infop info_ptr, png_uint_32 width, png_uint_32 height));
++#endif
++
+ /* These are the functions that do the transformations */
+ #ifdef PNG_READ_FILLER_SUPPORTED
+ PNG_EXTERN void png_do_read_filler PNGARG((png_row_infop row_info,
+@@ -3637,6 +3800,18 @@
+ png_uint_32 length)) PNG_PRIVATE;
+ #endif
+
++#ifdef PNG_READ_APNG_SUPPORTED
++PNG_EXTERN void png_handle_acTL PNGARG((png_structp png_ptr, png_infop info_ptr,
++ png_uint_32 length));
++PNG_EXTERN void png_handle_fcTL PNGARG((png_structp png_ptr, png_infop info_ptr,
++ png_uint_32 length));
++PNG_EXTERN void png_have_info PNGARG((png_structp png_ptr, png_infop info_ptr));
++PNG_EXTERN void png_handle_fdAT PNGARG((png_structp png_ptr, png_infop info_ptr,
++ png_uint_32 length));
++PNG_EXTERN void png_ensure_sequence_number PNGARG((png_structp png_ptr,
++ png_uint_32 length));
++#endif
++
+ PNG_EXTERN void png_handle_unknown PNGARG((png_structp png_ptr,
+ png_infop info_ptr, png_uint_32 length)) PNG_PRIVATE;
+
+Index: pngwrite.c
+===================================================================
+--- pngwrite.c
++++ pngwrite.c
+@@ -57,6 +57,10 @@
+ /* The rest of these check to see if the valid field has the appropriate
+ * flag set, and if it does, writes the chunk.
+ */
++#ifdef PNG_WRITE_APNG_SUPPORTED
++ if (info_ptr->valid & PNG_INFO_acTL)
++ png_write_acTL(png_ptr, info_ptr->num_frames, info_ptr->num_plays);
++#endif
+ #ifdef PNG_WRITE_gAMA_SUPPORTED
+ if (info_ptr->valid & PNG_INFO_gAMA)
+ {
+@@ -319,6 +323,10 @@
+ return;
+ if (!(png_ptr->mode & PNG_HAVE_IDAT))
+ png_error(png_ptr, "No IDATs written into file");
++#ifdef PNG_WRITE_APNG_SUPPORTED
++ if (png_ptr->num_frames_written != png_ptr->num_frames_to_write)
++ png_error(png_ptr, "Not enough frames written");
++#endif
+
+ /* See if user wants us to write information chunks */
+ if (info_ptr != NULL)
+@@ -1589,4 +1597,39 @@
+ params = params;
+ }
+ #endif
++
++#ifdef PNG_WRITE_APNG_SUPPORTED
++void PNGAPI
++png_write_frame_head(png_structp png_ptr, png_infop info_ptr,
++ png_bytepp row_pointers, png_uint_32 width, png_uint_32 height,
++ png_uint_32 x_offset, png_uint_32 y_offset,
++ png_uint_16 delay_num, png_uint_16 delay_den, png_byte dispose_op,
++ png_byte blend_op)
++{
++ png_debug(1, "in png_write_frame_head");
++
++ /* there is a chance this has been set after png_write_info was called,
++ * so it would be set but not written. is there a way to be sure? */
++ if (!(info_ptr->valid & PNG_INFO_acTL))
++ png_error(png_ptr, "png_write_frame_head(): acTL not set");
++
++ png_write_reset(png_ptr);
++
++ png_write_reinit(png_ptr, info_ptr, width, height);
++
++ if ( !(png_ptr->num_frames_written == 0 &&
++ (png_ptr->apng_flags & PNG_FIRST_FRAME_HIDDEN) ) )
++ png_write_fcTL(png_ptr, width, height, x_offset, y_offset,
++ delay_num, delay_den, dispose_op, blend_op);
++}
++
++void PNGAPI
++png_write_frame_tail(png_structp png_ptr, png_infop png_info)
++{
++ png_debug(1, "in png_write_frame_tail");
++
++ png_ptr->num_frames_written++;
++}
++#endif /* PNG_WRITE_APNG_SUPPORTED */
++
+ #endif /* PNG_WRITE_SUPPORTED */
+Index: pngconf.h
+===================================================================
+--- pngconf.h
++++ pngconf.h
+@@ -951,6 +951,10 @@
+ # define PNG_NO_READ_tEXt
+ # define PNG_NO_READ_zTXt
+ #endif
++#ifndef PNG_NO_READ_APNG
++# define PNG_READ_APNG_SUPPORTED
++# define PNG_APNG_SUPPORTED
++#endif
+ #ifndef PNG_NO_READ_bKGD
+ # define PNG_READ_bKGD_SUPPORTED
+ # define PNG_bKGD_SUPPORTED
+@@ -1177,6 +1181,14 @@
+ # define PNG_TEXT_SUPPORTED
+ # endif
+ #endif
++#ifndef PNG_NO_WRITE_APNG
++# ifndef PNG_WRITE_APNG_SUPPORTED
++# define PNG_WRITE_APNG_SUPPORTED
++# endif
++# ifndef PNG_APNG_SUPPORTED
++# define PNG_APNG_SUPPORTED
++# endif
++#endif
+
+ #ifdef PNG_WRITE_tIME_SUPPORTED
+ # ifndef PNG_NO_CONVERT_tIME
+Index: pngpread.c
+===================================================================
+--- pngpread.c
++++ pngpread.c
+@@ -206,6 +206,11 @@
+ #ifdef PNG_READ_zTXt_SUPPORTED
+ PNG_CONST PNG_zTXt;
+ #endif
++#ifdef PNG_READ_APNG_SUPPORTED
++ PNG_CONST PNG_acTL;
++ PNG_CONST PNG_fcTL;
++ PNG_CONST PNG_fdAT;
++#endif
+ #endif /* PNG_USE_LOCAL_ARRAYS */
+
+ /* First we make sure we have enough data for the 4 byte chunk name
+@@ -232,6 +237,103 @@
+ png_ptr->mode |= PNG_HAVE_CHUNK_HEADER;
+ }
+
++#ifdef PNG_READ_APNG_SUPPORTED
++ if (png_ptr->num_frames_read > 0 &&
++ png_ptr->num_frames_read < info_ptr->num_frames)
++ {
++ if (!png_memcmp(png_ptr->chunk_name, png_IDAT, 4))
++ {
++ /* Discard trailing IDATs for the first frame */
++ if (png_ptr->mode & PNG_HAVE_fcTL || png_ptr->num_frames_read > 1)
++ png_error(png_ptr, "out of place IDAT");
++
++ if (png_ptr->push_length + 4 > png_ptr->buffer_size)
++ {
++ png_push_save_buffer(png_ptr);
++ return;
++ }
++ png_push_crc_skip(png_ptr, png_ptr->push_length);
++ png_ptr->mode &= ~PNG_HAVE_CHUNK_HEADER;
++ return;
++ }
++ else if (!png_memcmp(png_ptr->chunk_name, png_fdAT, 4))
++ {
++ if (png_ptr->buffer_size < 4)
++ {
++ png_push_save_buffer(png_ptr);
++ return;
++ }
++ png_ensure_sequence_number(png_ptr, 4);
++
++ if (!(png_ptr->mode & PNG_HAVE_fcTL))
++ {
++ /* Discard trailing fdATs for frames other than the first */
++ if (png_ptr->num_frames_read < 2)
++ png_error(png_ptr, "out of place fdAT");
++
++ if (png_ptr->push_length + 4 > png_ptr->buffer_size)
++ {
++ png_push_save_buffer(png_ptr);
++ return;
++ }
++ png_push_crc_skip(png_ptr, png_ptr->push_length);
++ png_ptr->mode &= ~PNG_HAVE_CHUNK_HEADER;
++ return;
++ }
++ else
++ {
++ /* frame data follows */
++ png_ptr->idat_size = png_ptr->push_length - 4;
++ png_ptr->mode |= PNG_HAVE_IDAT;
++ png_ptr->process_mode = PNG_READ_IDAT_MODE;
++
++ return;
++ }
++ }
++ else if(!png_memcmp(png_ptr->chunk_name, png_fcTL, 4))
++ {
++ if (png_ptr->push_length + 4 > png_ptr->buffer_size)
++ {
++ png_push_save_buffer(png_ptr);
++ return;
++ }
++
++ png_read_reset(png_ptr);
++ png_ptr->mode &= ~PNG_HAVE_fcTL;
++
++ png_handle_fcTL(png_ptr, info_ptr, png_ptr->push_length);
++
++ if (!(png_ptr->mode & PNG_HAVE_fcTL))
++ png_error(png_ptr, "missing required fcTL chunk");
++
++ png_read_reinit(png_ptr, info_ptr);
++ png_progressive_read_reset(png_ptr);
++
++ if (png_ptr->frame_info_fn != NULL)
++ (*(png_ptr->frame_info_fn))(png_ptr, png_ptr->num_frames_read);
++
++ png_ptr->mode &= ~PNG_HAVE_CHUNK_HEADER;
++
++ return;
++ }
++ else
++ {
++ if (png_ptr->push_length + 4 > png_ptr->buffer_size)
++ {
++ png_push_save_buffer(png_ptr);
++ return;
++ }
++ png_warning(png_ptr, "Skipped (ignored) a chunk "
++ "between APNG chunks");
++ png_push_crc_skip(png_ptr, png_ptr->push_length);
++ png_ptr->mode &= ~PNG_HAVE_CHUNK_HEADER;
++ return;
++ }
++
++ return;
++ }
++#endif /* PNG_READ_APNG_SUPPORTED */
++
+ if (!png_memcmp(png_ptr->chunk_name, png_IDAT, 4))
+ if (png_ptr->mode & PNG_AFTER_IDAT)
+ png_ptr->mode |= PNG_HAVE_CHUNK_AFTER_IDAT;
+@@ -327,6 +429,9 @@
+ png_error(png_ptr, "Too many IDAT's found");
+ }
+
++#ifdef PNG_READ_APNG_SUPPORTED
++ png_have_info(png_ptr, info_ptr);
++#endif
+ png_ptr->idat_size = png_ptr->push_length;
+ png_ptr->mode |= PNG_HAVE_IDAT;
+ png_ptr->process_mode = PNG_READ_IDAT_MODE;
+@@ -559,6 +664,38 @@
+ }
+
+ #endif
++#ifdef PNG_READ_APNG_SUPPORTED
++ else if (!png_memcmp(png_ptr->chunk_name, png_acTL, 4))
++ {
++ if (png_ptr->push_length + 4 > png_ptr->buffer_size)
++ {
++ png_push_save_buffer(png_ptr);
++ return;
++ }
++
++ png_handle_acTL(png_ptr, info_ptr, png_ptr->push_length);
++ }
++ else if (!png_memcmp(png_ptr->chunk_name, png_fcTL, 4))
++ {
++ if (png_ptr->push_length + 4 > png_ptr->buffer_size)
++ {
++ png_push_save_buffer(png_ptr);
++ return;
++ }
++
++ png_handle_fcTL(png_ptr, info_ptr, png_ptr->push_length);
++ }
++ else if (!png_memcmp(png_ptr->chunk_name, png_fdAT, 4))
++ {
++ if (png_ptr->push_length + 4 > png_ptr->buffer_size)
++ {
++ png_push_save_buffer(png_ptr);
++ return;
++ }
++
++ png_handle_fdAT(png_ptr, info_ptr, png_ptr->push_length);
++ }
++#endif /* PNG_READ_APNG_SUPPORTED */
+ else
+ {
+ if (png_ptr->push_length + 4 > png_ptr->buffer_size)
+@@ -738,13 +875,17 @@
+ png_push_read_IDAT(png_structp png_ptr)
+ {
+ #ifdef PNG_USE_LOCAL_ARRAYS
+- PNG_CONST PNG_IDAT;
++ PNG_IDAT;
++#ifdef PNG_READ_APNG_SUPPORTED
++ PNG_fdAT;
++ PNG_IEND;
++#endif
+ #endif
+ if (!(png_ptr->mode & PNG_HAVE_CHUNK_HEADER))
+ {
+ png_byte chunk_length[4];
+
+- if (png_ptr->buffer_size < 8)
++ if (png_ptr->buffer_size < 12)
+ {
+ png_push_save_buffer(png_ptr);
+ return;
+@@ -756,15 +897,62 @@
+ png_crc_read(png_ptr, png_ptr->chunk_name, 4);
+ png_ptr->mode |= PNG_HAVE_CHUNK_HEADER;
+
+- if (png_memcmp(png_ptr->chunk_name, png_IDAT, 4))
++#ifdef PNG_READ_APNG_SUPPORTED
++ if (png_memcmp(png_ptr->chunk_name, (png_bytep)png_fdAT, 4)
++ && png_ptr->num_frames_read > 0)
++ {
++ if (png_ptr->flags & PNG_FLAG_ZLIB_FINISHED)
++ {
++ png_ptr->process_mode = PNG_READ_CHUNK_MODE;
++ if (png_ptr->frame_end_fn != NULL)
++ (*(png_ptr->frame_end_fn))(png_ptr, png_ptr->num_frames_read);
++ png_ptr->num_frames_read++;
++ return;
++ }
++ else
++ {
++ if (!png_memcmp(png_ptr->chunk_name, png_IEND, 4))
++ png_error(png_ptr, "Not enough image data");
++ if (png_ptr->push_length + 4 > png_ptr->buffer_size)
++ {
++ png_push_save_buffer(png_ptr);
++ return;
++ }
++ png_warning(png_ptr, "Skipping (ignoring) a chunk between "
++ "APNG chunks");
++ png_crc_finish(png_ptr, png_ptr->push_length);
++ png_ptr->mode &= ~PNG_HAVE_CHUNK_HEADER;
++ return;
++ }
++ }
++ else
++#endif
++ if (png_memcmp(png_ptr->chunk_name, png_IDAT, 4)
++#ifdef PNG_READ_APNG_SUPPORTED
++ && (png_ptr->num_frames_read == 0)
++#endif
++ )
+ {
+ png_ptr->process_mode = PNG_READ_CHUNK_MODE;
+ if (!(png_ptr->flags & PNG_FLAG_ZLIB_FINISHED))
+ png_error(png_ptr, "Not enough compressed data");
++#ifdef PNG_READ_APNG_SUPPORTED
++ if (png_ptr->frame_end_fn != NULL)
++ (*(png_ptr->frame_end_fn))(png_ptr, png_ptr->num_frames_read);
++ png_ptr->num_frames_read++;
++#endif
+ return;
+ }
+
+ png_ptr->idat_size = png_ptr->push_length;
++
++#ifdef PNG_READ_APNG_SUPPORTED
++ if (png_ptr->num_frames_read > 0)
++ {
++ png_ensure_sequence_number(png_ptr, 4);
++ png_ptr->idat_size -= 4;
++ }
++#endif
+ }
+ if (png_ptr->idat_size && png_ptr->save_buffer_size)
+ {
+@@ -1725,6 +1913,17 @@
+ png_set_read_fn(png_ptr, progressive_ptr, png_push_fill_buffer);
+ }
+
++#ifdef PNG_READ_APNG_SUPPORTED
++void PNGAPI
++png_set_progressive_frame_fn(png_structp png_ptr,
++ png_progressive_frame_ptr frame_info_fn,
++ png_progressive_frame_ptr frame_end_fn)
++{
++ png_ptr->frame_info_fn = frame_info_fn;
++ png_ptr->frame_end_fn = frame_end_fn;
++}
++#endif
++
+ png_voidp PNGAPI
+ png_get_progressive_ptr(png_structp png_ptr)
+ {
+Index: pngset.c
+===================================================================
+--- pngset.c
++++ pngset.c
+@@ -266,6 +266,11 @@
+ info_ptr->rowbytes = (png_size_t)0;
+ else
+ info_ptr->rowbytes = PNG_ROWBYTES(info_ptr->pixel_depth, width);
++
++#ifdef PNG_APNG_SUPPORTED
++ /* for non-animated png. this may be overritten from an acTL chunk later */
++ info_ptr->num_frames = 1;
++#endif
+ }
+
+ #ifdef PNG_oFFs_SUPPORTED
+@@ -960,6 +965,142 @@
+ }
+ #endif /* PNG_sPLT_SUPPORTED */
+
++#ifdef PNG_APNG_SUPPORTED
++png_uint_32 PNGAPI
++png_set_acTL(png_structp png_ptr, png_infop info_ptr,
++ png_uint_32 num_frames, png_uint_32 num_plays)
++{
++ png_debug1(1, "in %s storage function", "acTL");
++
++ if (png_ptr == NULL || info_ptr == NULL)
++ {
++ png_warning(png_ptr,
++ "Call to png_set_acTL() with NULL png_ptr "
++ "or info_ptr ignored");
++ return (0);
++ }
++ if (num_frames == 0)
++ {
++ png_warning(png_ptr,
++ "Ignoring attempt to set acTL with num_frames zero");
++ return (0);
++ }
++ if (num_frames > PNG_UINT_31_MAX)
++ {
++ png_warning(png_ptr,
++ "Ignoring attempt to set acTL with num_frames > 2^31-1");
++ return (0);
++ }
++ if (num_plays > PNG_UINT_31_MAX)
++ {
++ png_warning(png_ptr,
++ "Ignoring attempt to set acTL with num_plays "
++ "> 2^31-1");
++ return (0);
++ }
++
++ info_ptr->num_frames = num_frames;
++ info_ptr->num_plays = num_plays;
++
++ info_ptr->valid |= PNG_INFO_acTL;
++
++ return (1);
++}
++
++/* delay_num and delay_den can hold any 16-bit values including zero */
++png_uint_32 PNGAPI
++png_set_next_frame_fcTL(png_structp png_ptr, png_infop info_ptr,
++ png_uint_32 width, png_uint_32 height,
++ png_uint_32 x_offset, png_uint_32 y_offset,
++ png_uint_16 delay_num, png_uint_16 delay_den,
++ png_byte dispose_op, png_byte blend_op)
++{
++ png_debug1(1, "in %s storage function", "fcTL");
++
++ if (png_ptr == NULL || info_ptr == NULL)
++ {
++ png_warning(png_ptr,
++ "Call to png_set_fcTL() with NULL png_ptr or info_ptr "
++ "ignored");
++ return (0);
++ }
++
++ png_ensure_fcTL_is_valid(png_ptr, width, height, x_offset, y_offset,
++ delay_num, delay_den, dispose_op, blend_op);
++
++ if (blend_op == PNG_BLEND_OP_OVER)
++ {
++ if (!(png_ptr->color_type & PNG_COLOR_MASK_ALPHA) &&
++ !(png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)))
++ {
++ png_warning(png_ptr, "PNG_BLEND_OP_OVER is meaningless "
++ "and wasteful for opaque images, ignored");
++ blend_op = PNG_BLEND_OP_SOURCE;
++ }
++ }
++
++ info_ptr->next_frame_width = width;
++ info_ptr->next_frame_height = height;
++ info_ptr->next_frame_x_offset = x_offset;
++ info_ptr->next_frame_y_offset = y_offset;
++ info_ptr->next_frame_delay_num = delay_num;
++ info_ptr->next_frame_delay_den = delay_den;
++ info_ptr->next_frame_dispose_op = dispose_op;
++ info_ptr->next_frame_blend_op = blend_op;
++
++ info_ptr->valid |= PNG_INFO_fcTL;
++
++ return (1);
++}
++
++void PNGAPI
++png_ensure_fcTL_is_valid(png_structp png_ptr,
++ png_uint_32 width, png_uint_32 height,
++ png_uint_32 x_offset, png_uint_32 y_offset,
++ png_uint_16 delay_num, png_uint_16 delay_den,
++ png_byte dispose_op, png_byte blend_op)
++{
++ if (width + x_offset > png_ptr->first_frame_width ||
++ height + y_offset > png_ptr->first_frame_height)
++ png_error(png_ptr, "dimensions of a frame are greater than"
++ "the ones in IHDR");
++ if (width > PNG_UINT_31_MAX)
++ png_error(png_ptr, "invalid width in fcTL (> 2^31-1)");
++ if (height > PNG_UINT_31_MAX)
++ png_error(png_ptr, "invalid height in fcTL (> 2^31-1)");
++ if (x_offset > PNG_UINT_31_MAX)
++ png_error(png_ptr, "invalid x_offset in fcTL (> 2^31-1)");
++ if (y_offset > PNG_UINT_31_MAX)
++ png_error(png_ptr, "invalid y_offset in fcTL (> 2^31-1)");
++
++ if (dispose_op != PNG_DISPOSE_OP_NONE &&
++ dispose_op != PNG_DISPOSE_OP_BACKGROUND &&
++ dispose_op != PNG_DISPOSE_OP_PREVIOUS)
++ png_error(png_ptr, "invalid dispose_op in fcTL");
++
++ if (blend_op != PNG_BLEND_OP_SOURCE &&
++ blend_op != PNG_BLEND_OP_OVER)
++ png_error(png_ptr, "invalid blend_op in fcTL");
++}
++
++png_uint_32 PNGAPI
++png_set_first_frame_is_hidden(png_structp png_ptr, png_infop info_ptr,
++ png_byte is_hidden)
++{
++ png_debug(1, "in png_first_frame_is_hidden()");
++
++ if (png_ptr == NULL)
++ return 0;
++
++ if(is_hidden)
++ png_ptr->apng_flags |= PNG_FIRST_FRAME_HIDDEN;
++ else
++ png_ptr->apng_flags &= ~PNG_FIRST_FRAME_HIDDEN;
++
++ return 1;
++}
++#endif /* PNG_APNG_SUPPORTED */
++
+ #ifdef PNG_UNKNOWN_CHUNKS_SUPPORTED
+ void PNGAPI
+ png_set_unknown_chunks(png_structp png_ptr,
+Index: pngrutil.c
+===================================================================
+--- pngrutil.c
++++ pngrutil.c
+@@ -451,6 +451,11 @@
+ filter_type = buf[11];
+ interlace_type = buf[12];
+
++#ifdef PNG_READ_APNG_SUPPORTED
++ png_ptr->first_frame_width = width;
++ png_ptr->first_frame_height = height;
++#endif
++
+ /* Set internal variables */
+ png_ptr->width = width;
+ png_ptr->height = height;
+@@ -2323,6 +2328,172 @@
+ }
+ #endif
+
++#ifdef PNG_READ_APNG_SUPPORTED
++void /* PRIVATE */
++png_handle_acTL(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
++{
++ png_byte data[8];
++ png_uint_32 num_frames;
++ png_uint_32 num_plays;
++ png_uint_32 didSet;
++
++ png_debug(1, "in png_handle_acTL");
++
++ if (!(png_ptr->mode & PNG_HAVE_IHDR))
++ {
++ png_error(png_ptr, "Missing IHDR before acTL");
++ }
++ else if (png_ptr->mode & PNG_HAVE_IDAT)
++ {
++ png_warning(png_ptr, "Invalid acTL after IDAT skipped");
++ png_crc_finish(png_ptr, length);
++ return;
++ }
++ else if (png_ptr->mode & PNG_HAVE_acTL)
++ {
++ png_warning(png_ptr, "Duplicate acTL skipped");
++ png_crc_finish(png_ptr, length);
++ return;
++ }
++ else if (length != 8)
++ {
++ png_warning(png_ptr, "acTL with invalid length skipped");
++ png_crc_finish(png_ptr, length);
++ return;
++ }
++
++ png_crc_read(png_ptr, data, 8);
++ png_crc_finish(png_ptr, 0);
++
++ num_frames = png_get_uint_31(png_ptr, data);
++ num_plays = png_get_uint_31(png_ptr, data + 4);
++
++ /* the set function will do error checking on num_frames */
++ didSet = png_set_acTL(png_ptr, info_ptr, num_frames, num_plays);
++ if(didSet)
++ png_ptr->mode |= PNG_HAVE_acTL;
++}
++
++void /* PRIVATE */
++png_handle_fcTL(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
++{
++ png_byte data[22];
++ png_uint_32 width;
++ png_uint_32 height;
++ png_uint_32 x_offset;
++ png_uint_32 y_offset;
++ png_uint_16 delay_num;
++ png_uint_16 delay_den;
++ png_byte dispose_op;
++ png_byte blend_op;
++
++ png_debug(1, "in png_handle_fcTL");
++
++ png_ensure_sequence_number(png_ptr, length);
++
++ if (!(png_ptr->mode & PNG_HAVE_IHDR))
++ {
++ png_error(png_ptr, "Missing IHDR before fcTL");
++ }
++ else if (png_ptr->mode & PNG_HAVE_IDAT)
++ {
++ /* for any frames other then the first this message may be misleading,
++ * but correct. PNG_HAVE_IDAT is unset before the frame head is read
++ * i can't think of a better message */
++ png_warning(png_ptr, "Invalid fcTL after IDAT skipped");
++ png_crc_finish(png_ptr, length-4);
++ return;
++ }
++ else if (png_ptr->mode & PNG_HAVE_fcTL)
++ {
++ png_warning(png_ptr, "Duplicate fcTL within one frame skipped");
++ png_crc_finish(png_ptr, length-4);
++ return;
++ }
++ else if (length != 26)
++ {
++ png_warning(png_ptr, "fcTL with invalid length skipped");
++ png_crc_finish(png_ptr, length-4);
++ return;
++ }
++
++ png_crc_read(png_ptr, data, 22);
++ png_crc_finish(png_ptr, 0);
++
++ width = png_get_uint_31(png_ptr, data);
++ height = png_get_uint_31(png_ptr, data + 4);
++ x_offset = png_get_uint_31(png_ptr, data + 8);
++ y_offset = png_get_uint_31(png_ptr, data + 12);
++ delay_num = png_get_uint_16(data + 16);
++ delay_den = png_get_uint_16(data + 18);
++ dispose_op = data[20];
++ blend_op = data[21];
++
++ if (png_ptr->num_frames_read == 0 && (x_offset != 0 || y_offset != 0))
++ png_error(png_ptr, "fcTL for the first frame must have zero offset");
++
++ if (info_ptr != NULL)
++ {
++ if (png_ptr->num_frames_read == 0 &&
++ (width != info_ptr->width || height != info_ptr->height))
++ png_error(png_ptr, "size in first frame's fcTL must match "
++ "the size in IHDR");
++
++ /* the set function will do more error checking */
++ png_set_next_frame_fcTL(png_ptr, info_ptr, width, height,
++ x_offset, y_offset, delay_num, delay_den,
++ dispose_op, blend_op);
++
++ png_read_reinit(png_ptr, info_ptr);
++ }
++
++ png_ptr->mode |= PNG_HAVE_fcTL;
++}
++
++void /* PRIVATE */
++png_have_info(png_structp png_ptr, png_infop info_ptr)
++{
++ if((info_ptr->valid & PNG_INFO_acTL) && !(info_ptr->valid & PNG_INFO_fcTL))
++ {
++ png_ptr->apng_flags |= PNG_FIRST_FRAME_HIDDEN;
++ info_ptr->num_frames++;
++ }
++}
++
++void /* PRIVATE */
++png_handle_fdAT(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
++{
++ png_ensure_sequence_number(png_ptr, length);
++
++ /* This function is only called from png_read_end(), png_read_info(),
++ * and png_push_read_chunk() which means that:
++ * - the user doesn't want to read this frame
++ * - or this is an out-of-place fdAT
++ * in either case it is safe to ignore the chunk with a warning */
++ png_warning(png_ptr, "ignoring fdAT chunk");
++ png_crc_finish(png_ptr, length - 4);
++}
++
++void /* PRIVATE */
++png_ensure_sequence_number(png_structp png_ptr, png_uint_32 length)
++{
++ png_byte data[4];
++ png_uint_32 sequence_number;
++
++ if (length < 4)
++ png_error(png_ptr, "invalid fcTL or fdAT chunk found");
++
++ png_crc_read(png_ptr, data, 4);
++ sequence_number = png_get_uint_31(png_ptr, data);
++
++ if (sequence_number != png_ptr->next_seq_num)
++ png_error(png_ptr, "fcTL or fdAT chunk with out-of-order sequence "
++ "number found");
++
++ png_ptr->next_seq_num++;
++}
++#endif /* PNG_READ_APNG_SUPPORTED */
++
+ /* This function is called when we haven't found a handler for a
+ chunk. If there isn't a problem with the chunk itself (ie bad
+ chunk name, CRC, or a critical chunk), the chunk is silently ignored
+@@ -3354,4 +3525,75 @@
+
+ png_ptr->flags |= PNG_FLAG_ROW_INIT;
+ }
++
++#ifdef PNG_READ_APNG_SUPPORTED
++/* This function is to be called after the main IDAT set has been read and
++ * before a new IDAT is read. It resets some parts of png_ptr
++ * to make them usable by the read functions again */
++void /* PRIVATE */
++png_read_reset(png_structp png_ptr)
++{
++ png_ptr->mode &= ~PNG_HAVE_IDAT;
++ png_ptr->mode &= ~PNG_AFTER_IDAT;
++ png_ptr->row_number = 0;
++ png_ptr->pass = 0;
++ png_ptr->flags &= ~PNG_FLAG_ROW_INIT;
++}
++
++void /* PRIVATE */
++png_read_reinit(png_structp png_ptr, png_infop info_ptr)
++{
++ png_ptr->width = info_ptr->next_frame_width;
++ png_ptr->height = info_ptr->next_frame_height;
++ png_ptr->rowbytes = PNG_ROWBYTES(png_ptr->pixel_depth,png_ptr->width);
++ if (png_ptr->prev_row)
++ png_memset_check(png_ptr, png_ptr->prev_row, 0, png_ptr->rowbytes + 1);
++}
++
++/* same as png_read_reset() but for the progressive reader */
++void /* PRIVATE */
++png_progressive_read_reset(png_structp png_ptr)
++{
++#ifdef PNG_USE_LOCAL_ARRAYS
++ /* start of interlace block */
++ const int FARDATA png_pass_start[] = {0, 4, 0, 2, 0, 1, 0};
++
++ /* offset to next interlace block */
++ const int FARDATA png_pass_inc[] = {8, 8, 4, 4, 2, 2, 1};
++
++ /* start of interlace block in the y direction */
++ const int FARDATA png_pass_ystart[] = {0, 0, 4, 0, 2, 0, 1};
++
++ /* offset to next interlace block in the y direction */
++ const int FARDATA png_pass_yinc[] = {8, 8, 8, 4, 4, 2, 2};
++#endif
++
++ if (png_ptr->interlaced)
++ {
++ if (!(png_ptr->transformations & PNG_INTERLACE))
++ png_ptr->num_rows = (png_ptr->height + png_pass_yinc[0] - 1 -
++ png_pass_ystart[0]) / png_pass_yinc[0];
++ else
++ png_ptr->num_rows = png_ptr->height;
++
++ png_ptr->iwidth = (png_ptr->width +
++ png_pass_inc[png_ptr->pass] - 1 -
++ png_pass_start[png_ptr->pass]) /
++ png_pass_inc[png_ptr->pass];
++ }
++ else
++ {
++ png_ptr->num_rows = png_ptr->height;
++ png_ptr->iwidth = png_ptr->width;
++ }
++ png_ptr->flags &= ~PNG_FLAG_ZLIB_FINISHED;
++ if (inflateReset(&(png_ptr->zstream)) != Z_OK)
++ png_error(png_ptr, "inflateReset failed");
++ png_ptr->zstream.avail_in = 0;
++ png_ptr->zstream.next_in = 0;
++ png_ptr->zstream.next_out = png_ptr->row_buf;
++ png_ptr->zstream.avail_out = (uInt)PNG_ROWBYTES(png_ptr->pixel_depth,
++ png_ptr->iwidth) + 1;
++}
++#endif /* PNG_READ_APNG_SUPPORTED */
+ #endif /* PNG_READ_SUPPORTED */
+Index: pngwutil.c
+===================================================================
+--- pngwutil.c
++++ pngwutil.c
+@@ -516,6 +516,11 @@
+ /* Write the chunk */
+ png_write_chunk(png_ptr, (png_bytep)png_IHDR, buf, (png_size_t)13);
+
++#ifdef PNG_WRITE_APNG_SUPPORTED
++ png_ptr->first_frame_width = width;
++ png_ptr->first_frame_height = height;
++#endif
++
+ /* Initialize zlib with PNG info */
+ png_ptr->zstream.zalloc = png_zalloc;
+ png_ptr->zstream.zfree = png_zfree;
+@@ -641,6 +646,9 @@
+ {
+ #ifdef PNG_USE_LOCAL_ARRAYS
+ PNG_IDAT;
++#ifdef PNG_WRITE_APNG_SUPPORTED
++ PNG_fdAT;
++#endif
+ #endif
+
+ png_debug(1, "in png_write_IDAT");
+@@ -686,7 +694,28 @@
+ "Invalid zlib compression method or flags in IDAT");
+ }
+
++#ifdef PNG_WRITE_APNG_SUPPORTED
++ if(png_ptr->num_frames_written == 0)
++#endif
+ png_write_chunk(png_ptr, (png_bytep)png_IDAT, data, length);
++#ifdef PNG_WRITE_APNG_SUPPORTED
++ else
++ {
++ png_byte buf[4];
++
++ png_write_chunk_start(png_ptr, (png_bytep)png_fdAT, 4 + length);
++
++ png_save_uint_32(buf, png_ptr->next_seq_num);
++ png_write_chunk_data(png_ptr, buf, 4);
++
++ png_write_chunk_data(png_ptr, data, length);
++
++ png_write_chunk_end(png_ptr);
++
++ png_ptr->next_seq_num++;
++ }
++#endif
++
+ png_ptr->mode |= PNG_HAVE_IDAT;
+ }
+
+@@ -1754,6 +1783,70 @@
+ }
+ #endif
+
++#ifdef PNG_WRITE_APNG_SUPPORTED
++void /* PRIVATE */
++png_write_acTL(png_structp png_ptr,
++ png_uint_32 num_frames, png_uint_32 num_plays)
++{
++#ifdef PNG_USE_LOCAL_ARRAYS
++ PNG_acTL;
++#endif
++ png_byte data[16];
++
++ png_debug(1, "in png_write_acTL");
++
++ png_ptr->num_frames_to_write = num_frames;
++
++ if (png_ptr->apng_flags & PNG_FIRST_FRAME_HIDDEN)
++ num_frames--;
++
++ png_save_uint_32(data, num_frames);
++ png_save_uint_32(data + 4, num_plays);
++
++ png_write_chunk(png_ptr, (png_bytep)png_acTL, data, (png_size_t)8);
++}
++
++void /* PRIVATE */
++png_write_fcTL(png_structp png_ptr, png_uint_32 width, png_uint_32 height,
++ png_uint_32 x_offset, png_uint_32 y_offset,
++ png_uint_16 delay_num, png_uint_16 delay_den, png_byte dispose_op,
++ png_byte blend_op)
++{
++#ifdef PNG_USE_LOCAL_ARRAYS
++ PNG_fcTL;
++#endif
++ png_byte data[26];
++
++ png_debug(1, "in png_write_fcTL");
++
++ if (png_ptr->num_frames_written == 0 && (x_offset != 0 || y_offset != 0))
++ png_error(png_ptr, "x and/or y offset for the first frame aren't 0");
++ if (png_ptr->num_frames_written == 0 &&
++ (width != png_ptr->first_frame_width ||
++ height != png_ptr->first_frame_height))
++ png_error(png_ptr, "width and/or height in the first frame's fcTL "
++ "don't match the ones in IHDR");
++
++ /* more error checking */
++ png_ensure_fcTL_is_valid(png_ptr, width, height, x_offset, y_offset,
++ delay_num, delay_den, dispose_op, blend_op);
++
++ png_save_uint_32(data, png_ptr->next_seq_num);
++ png_save_uint_32(data + 4, width);
++ png_save_uint_32(data + 8, height);
++ png_save_uint_32(data + 12, x_offset);
++ png_save_uint_32(data + 16, y_offset);
++ png_save_uint_16(data + 20, delay_num);
++ png_save_uint_16(data + 22, delay_den);
++ data[24] = dispose_op;
++ data[25] = blend_op;
++
++ png_write_chunk(png_ptr, (png_bytep)png_fcTL, data, (png_size_t)26);
++
++ png_ptr->next_seq_num++;
++}
++#endif /* PNG_WRITE_APNG_SUPPORTED */
++
+ /* Initializes the row writing capability of libpng */
+ void /* PRIVATE */
+ png_write_start_row(png_structp png_ptr)
+@@ -2159,8 +2252,8 @@
+ #ifndef PNG_WRITE_WEIGHTED_FILTER_SUPPORTED
+ if (png_ptr->row_number == 0 && filter_to_do == PNG_ALL_FILTERS)
+ {
+- /* These will never be selected so we need not test them. */
+- filter_to_do &= ~(PNG_FILTER_UP | PNG_FILTER_PAETH);
++ /* These use previous row */
++ filter_to_do &= ~(PNG_FILTER_UP | PNG_FILTER_AVG | PNG_FILTER_PAETH);
+ }
+ #endif
+
+@@ -2829,4 +2922,39 @@
+ }
+ #endif
+ }
++
++#ifdef PNG_WRITE_APNG_SUPPORTED
++void /* PRIVATE */
++png_write_reset(png_structp png_ptr)
++{
++ png_ptr->row_number = 0;
++ png_ptr->pass = 0;
++ png_ptr->mode &= ~PNG_HAVE_IDAT;
++}
++
++void /* PRIVATE */
++png_write_reinit(png_structp png_ptr, png_infop info_ptr,
++ png_uint_32 width, png_uint_32 height)
++{
++ if (png_ptr->num_frames_written == 0 &&
++ (width != png_ptr->first_frame_width ||
++ height != png_ptr->first_frame_height))
++ png_error(png_ptr, "width and/or height in the first frame's fcTL "
++ "don't match the ones in IHDR");
++ if (width > png_ptr->first_frame_width ||
++ height > png_ptr->first_frame_height)
++ png_error(png_ptr, "width and/or height for a frame greater than"
++ "the ones in IHDR");
++
++ png_set_IHDR(png_ptr, info_ptr, width, height,
++ info_ptr->bit_depth, info_ptr->color_type,
++ info_ptr->interlace_type, info_ptr->compression_type,
++ info_ptr->filter_type);
++
++ png_ptr->width = width;
++ png_ptr->height = height;
++ png_ptr->rowbytes = PNG_ROWBYTES(png_ptr->pixel_depth, width);
++ png_ptr->usr_width = png_ptr->width;
++}
++#endif
+ #endif /* PNG_WRITE_SUPPORTED */
+Index: pngrtran.c
+===================================================================
+--- pngrtran.c
++++ pngrtran.c
+@@ -1352,7 +1352,7 @@
+ * pixels. This check added to libpng-1.2.19
+ */
+ #if (PNG_WARN_UNINITIALIZED_ROW==1)
+- png_error(png_ptr, "Uninitialized row");
++ png_warning(png_ptr, "Uninitialized row");
+ #else
+ png_warning(png_ptr, "Uninitialized row");
+ #endif
diff --git a/mozplugger/PKGBUILD b/mozplugger/PKGBUILD new file mode 100644 index 0000000..4111b07 --- /dev/null +++ b/mozplugger/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 82 2009-07-17 19:56:55Z aaron $ +# Maintainer: fs4000 <matthias_dienstbier[at]yahoo[dot]de> +# Contributor: Allan McRae <allan@archlinux.org> +# Contributor: Todd Musall <tmusall@comcast.net> + +pkgname=mozplugger +pkgver=1.13.3 +pkgrel=1 +pkgdesc="A Mozilla & Firefox multimedia plugin." +arch=('i686' 'x86_64') +url="http://mozplugger.mozdev.org" +license=('GPL') +depends=('m4' 'libx11') +backup=('etc/mozpluggerrc') +install=$pkgname.install +source=(http://mozplugger.mozdev.org/files/$pkgname-$pkgver.tar.gz) +md5sums=('42d2ac76d8bf6902743323fefd1801ba') + +build() { + cd $pkgname-$pkgver + make linux || return 1 + make install root="$pkgdir" + +# This is the install code used while being in [community] +# install -Dm755 mozplugger.so $pkgdir/usr/lib/mozilla/plugins/mozplugger.so +# install -Dm644 mozpluggerrc $pkgdir/etc/mozpluggerrc +# install -Dm755 mozplugger-helper $pkgdir/usr/bin/mozplugger-helper +# install -Dm755 mozplugger-controller $pkgdir/usr/bin/mozplugger-controller +# install -Dm755 mozplugger-linker $pkgdir/usr/bin/mozplugger-linker +# install -Dm644 mozplugger.7 $pkgdir/usr/share/man/man7/mozplugger.7 +} diff --git a/mozplugger/mozplugger.install b/mozplugger/mozplugger.install new file mode 100644 index 0000000..55125d7 --- /dev/null +++ b/mozplugger/mozplugger.install @@ -0,0 +1,15 @@ +post_install() { + echo " +==> You may need to delete your local ~/.mozilla/firefox/pluginreg.dat +==> file for mozplugger to be enabled correctly after you update it. +==> (It will get regenerated). +==> To add more helpers, edit /etc/mozpluggerrc. +==> The window name can be obtained using the utility xprop(1x). +==> Type "xprop WM_CLASS" and click on a window." +} + +post_upgrade() { + post_install +} + +# vim:set ts=2 sw=2 et: diff --git a/mpd-git/PKGBUILD b/mpd-git/PKGBUILD index b607e5a..40c6267 100644 --- a/mpd-git/PKGBUILD +++ b/mpd-git/PKGBUILD @@ -1,7 +1,7 @@ # Contributor: Slash <demodevil5[at]yahoo[dot]com> pkgname=mpd-git -pkgver=20100111 +pkgver=20100412 pkgrel=1 pkgdesc="music daemon that plays mp3, flac, aac, mod, wav, mpc and ogg files" url="http://musicpd.org" diff --git a/mumble-git/PKGBUILD b/mumble-git/PKGBUILD index 890781f..7a1e8f3 100644 --- a/mumble-git/PKGBUILD +++ b/mumble-git/PKGBUILD @@ -2,13 +2,13 @@ # Contributor: schlaefer <schlaefer[at]gamez-planet.org> pkgname=mumble-git -pkgver=20100401 +pkgver=20100513 pkgrel=1 pkgdesc="A voice chat application similar to TeamSpeak" arch=('i686' 'x86_64') url="http://mumble.sourceforge.net/" license=('GPL') -depends=('alsa-lib' 'qt>=4.4.0' 'speex>=1.2rc1' 'celt=>0.7.0' 'lsb-release') +depends=('alsa-lib' 'qt>=4.4.0' 'speex>=1.2rc1' 'celt>=0.7.0' 'lsb-release') makedepends=('git' 'protobuf' 'boost' 'avahi') optdepends=('pulseaudio: for using mumble with pulseaudio') provides=('mumble') diff --git a/smplayer-svn/PKGBUILD b/smplayer-svn/PKGBUILD index 9a7eed3..83691d4 100644 --- a/smplayer-svn/PKGBUILD +++ b/smplayer-svn/PKGBUILD @@ -3,19 +3,18 @@ # Fixes by: WAntilles <wantilles@adslgr.com> pkgname=smplayer-svn -pkgver=3412 +pkgver=3537 pkgrel=1 -_latestver=0.6.8 +_latestver=0.6.9 pkgdesc="A complete front-end for MPlayer" arch=('i686' 'x86_64') url="http://smplayer.sourceforge.net/" license=('GPL') -depends=('qt>=4.5.2' 'mplayer>=29411') +depends=('qt>=4.6.2' 'mplayer>=30526') makedepends=('subversion') conflicts=('smplayer') provides=("smplayer=${_latestver}") -source=() -md5sums=() +#source=("smplayer-build-fix.patch") _svnmod="smplayer" _svntrunk=https://smplayer.svn.sourceforge.net/svnroot/smplayer/smplayer/trunk/ @@ -41,7 +40,19 @@ build() cp -r $_svnmod $_svnmod-build cd $_svnmod-build + + # remove broken translation + sed -i "s|translations/smplayer_gl.ts|#translations/smplayer_gl.ts|" src/smplayer.pro || return 1 + sed -i 's/PREFIX=.*/PREFIX=\/usr/' Makefile || return 1 - make || return 1 - make PREFIX=/usr DESTDIR="${pkgdir}/" install -}
\ No newline at end of file + make PREFIX=/usr || return 1 + make DESTDIR=${pkgdir} PREFIX=/usr KDE_PREFIX=/usr install || return 1 + + install -dm755 ${pkgdir}/usr/share/pixmaps + ln -s ${pkgdir}/usr/share/icons/hicolor/64x64/apps/smplayer.png ${pkgdir}/usr/share/pixmaps/ + + sed -i 's|Exec=smplayer %U|Exec=smplayer %F|' ${pkgdir}/usr/share/applications/smplayer.desktop || return 1 + sed -i 's|Exec=smplayer -add-to-playlist %U|Exec=smplayer -add-to-playlist %F|' ${pkgdir}/usr/share/applications/smplayer_enqueue.desktop || return 1 + +} +md5sums=('7da2927266bc73a69a4dac0fae54c750') diff --git a/swaks/PKGBUILD b/swaks/PKGBUILD index f61f3f9..d44e773 100644 --- a/swaks/PKGBUILD +++ b/swaks/PKGBUILD @@ -1,16 +1,21 @@ -# Contributor: Testuser_01 <siebler_n@gmx.de> +# Maintainer: Testuser_01 <mail@nico-siebler.de> + pkgname=swaks -pkgver=20061116.0 +pkgver=20100211.0 pkgrel=1 -pkgdesc="Swiss Army Knife SMTP; Command line SMTP testing, including TLS and AUTH" -arch=("i686" "x86_64") -url="http://jetmore.org/john/code/#swaks" +pkgdesc='Swiss Army Knife SMTP; Command line SMTP testing, including TLS and AUTH' +arch=('i686' 'x86_64') +url="http://jetmore.org/john/code/${pkgname}/" license=('GPL') depends=('perl-net-dns') provides=('swaks') -source=("http://jetmore.org/john/code/$pkgname") -md5sums=('0be5dfe89ec415f0296680d61b3e4849') +source=("http://jetmore.org/john/code/${pkgname}/${pkgname}-${pkgver}.tar.gz") +md5sums=('b2ad29237f54208989a738c9a39a95f2') build() { - install -m755 -D $pkgname "$pkgdir/usr/bin/$pkgname" || return 1 + cd "${pkgname}-${pkgver}" || return 1 + install -m755 -D "${pkgname}" "$pkgdir/usr/bin/${pkgname}" || return 1 + cd doc || return 1 + pod2man ref.pod "${pkgname}.1" || return 1 + install -m644 -D "${pkgname}.1" "$pkgdir/usr/share/man/man1/${pkgname}.1" || return 1 } diff --git a/thunar-notrash/PKGBUILD b/thunar-notrash/PKGBUILD index 241479f..0bae7d7 100644 --- a/thunar-notrash/PKGBUILD +++ b/thunar-notrash/PKGBUILD @@ -3,8 +3,8 @@ # Contributor: Andrew Simmons <andrew.simmons@gmail.com> pkgname=thunar-notrash -pkgver=1.0.1 -pkgrel=2 +pkgver=1.0.2 +pkgrel=1 pkgdesc="new modern file manager for Xfce with patch to disable trash" arch=(i686 x86_64) license=('GPL2' 'LGPL2') @@ -12,34 +12,33 @@ url="http://thunar.xfce.org" groups=('xfce4') conflicts=(thunar) provides=("thunar=$pkgver") -depends=('desktop-file-utils' 'libexif>=0.6.17' 'xfce4-panel>=4.6.1' 'hicolor-icon-theme' 'fam') -makedepends=('intltool' 'pkgconfig') +depends=('desktop-file-utils' 'libexif>=0.6.19' 'hicolor-icon-theme' 'fam' \ + 'gtk2' 'exo>=0.3.107' 'libxfce4util>=4.6.2' 'hal>=0.5.14' 'libpng' 'libjpeg>=8.0.1' 'startup-notification') +makedepends=('intltool' 'pkgconfig' 'xfce4-panel>=4.6.4') optdepends=('gamin: a fam replacement to make thunar monitor changes to files on the fly') options=('!libtool') install=${pkgname}.install -source=(http://www.xfce.org/archive/xfce-4.6.1/src/Thunar-${pkgver}.tar.bz2 Ability_to_disable_trash_on_Thunar.patch - thunar-vfs-fix-umask.patch libpng-1.4.patch) +source=(http://archive.xfce.org/src/xfce/thunar/1.0/Thunar-${pkgver}.tar.bz2 + Ability_to_disable_trash_on_Thunar.patch) build() { cd ${srcdir}/Thunar-${pkgver} patch -p2 < $srcdir/Ability_to_disable_trash_on_Thunar.patch - patch -p1 < ../libpng-1.4.patch - patch -Np0 -i ${srcdir}/thunar-vfs-fix-umask.patch ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \ --localstatedir=/var --disable-static \ --disable-gnome-thumbnailers --enable-exif --enable-pcre \ --disable-wallpaper-plugin make || return 1 +} + +package() { + cd ${srcdir}/Thunar-${pkgver} make DESTDIR=${pkgdir} install || return 1 sed -i 's:x-directory/gnome-default-handler;::' \ ${pkgdir}/usr/share/applications/Thunar-folder-handler.desktop } -md5sums=('218373aa45d74b6ba8c69c4d5af3bb19' - '55816882bbeac5bb1153f0b195a220d7' - '7247041fd2c411e4a129d3f90350893c' - 'ee998c20ba13d0cb18741da8b7d67328') -sha1sums=('2fcd3a7b0e27b01f059dffc8ffdac94e2b2aa064' - 'c4b110b2a83b6d7b88e04bb550d20c598ffe6f82' - '47526f997627264813843cf466c5ee9335047458' - '99f520655582acb5bffbee72bf0bc37aef37bc69') +md5sums=('c91073202d373a1f9951a1240083c36d' + '55816882bbeac5bb1153f0b195a220d7') +sha1sums=('f7ae00c32402e4bc502aba15477b78e2c558c7c3' + 'c4b110b2a83b6d7b88e04bb550d20c598ffe6f82') diff --git a/virtualbox_bin/10-vboxdrv.rules b/virtualbox_bin/10-vboxdrv.rules new file mode 100644 index 0000000..59babea --- /dev/null +++ b/virtualbox_bin/10-vboxdrv.rules @@ -0,0 +1,3 @@ +KERNEL=="vboxdrv", NAME="vboxdrv", OWNER="root", GROUP="vboxusers", MODE="0660" +SUBSYSTEM=="usb_device", GROUP="vboxusers", MODE="0664" +SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GROUP="vboxusers", MODE="0664" diff --git a/virtualbox_bin/PKGBUILD b/virtualbox_bin/PKGBUILD new file mode 100644 index 0000000..605710a --- /dev/null +++ b/virtualbox_bin/PKGBUILD @@ -0,0 +1,104 @@ +# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> +# Contributor: thotypous <matiasΘarchlinux-br·org> +# Contributor: xduugu <xduuguΘgmx·com> +# Contributor: Peter 'piie' Feuerer <peterΘpiie·net> +# Contributor: Sascha Pfau <MrPeacockΘgmail·com> +# Contributor: iggy <iggy.mfΘgmail·com> + +pkgname="virtualbox_bin" +pkgver="3.2.0" +_build="61806" +pkgrel=1 +pkgdesc="Powerful x86 virtualization (Personal Use Binaries Edition)." +arch=('i686' 'x86_64') +url="http://virtualbox.org" +license=('custom:PUEL') +depends=('libidl2' 'libxcursor' 'libxinerama' 'libxslt' 'curl' 'gcc' 'make' 'kernel26-headers') +optdepends=("qt: for VirtualBox GUI" + "sdl: for VBoxSDL and VirtualBox GUI" + "libgl: for shared OpenGL" + "libxt: for shared Clipboard" + "alsa-lib: for ALSA support" + "pulseaudio: for PulseAudio support") +provides=("virtualbox=${pkgver}") +conflicts=('virtualbox-ose' 'virtualbox-modules') +install='virtualbox.install' +_architect='x86' +[ "$CARCH" = "x86_64" ] && _architect='amd64' +source=("VirtualBox-${pkgver}-${_build}-Linux_${_architect}.run::http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}-${_build}-Linux_${_architect}.run" + '10-vboxdrv.rules' + 'vbox_build_module') +md5sums=('003c36b1704dda450b6b21e99afc2d85' + '98859bfca9ef2ebf2ea43eb9123316fc' + 'dcb2d165b25274f77426a895d6dc41af') +[ "$CARCH" = "x86_64" ] && md5sums[0]='6fc4475dc26af6aa64bd9fb37ea9ca6a' + +build() { + # Check and unpack the run package via sh(1) + sh "VirtualBox-${pkgver}-${_build}-Linux_${_architect}.run" --check || return 1 + echo yes | sh "VirtualBox-${pkgver}-${_build}-Linux_${_architect}.run" --target "$srcdir" \ + --nox11 --noexec &> /dev/null || return 1 + + # Unpack bundled files + mkdir -p "$pkgdir/opt/VirtualBox" || return 1 + cd "$pkgdir/opt/VirtualBox" + tar -xjf "$srcdir/VirtualBox.tar.bz2" || return 1 + + mkdir -p "$pkgdir/usr/"{bin,share/applications,share/pixmaps} || return 1 + + # Hardened build: Mark binaries suid root, create symlinks for working around + # unsupported $ORIGIN/.. in VBoxC.so and make sure the + # directory is only writable by the user (paranoid). + chmod 4511 VirtualBox VBox{SDL,Headless,NetDHCP} + for _lib in VBox{VMM,REM,RT,DDU,XPCOM}.so; do + ln -sf "/opt/VirtualBox/${_lib}" "components/${_lib}" + done + chmod go-w . + + # VBoxNetAdpCtl needs to be suid root in any case + chmod 4511 VBoxNetAdpCtl + + # Replace VirtualBox built-in Qt by system Qt libraries (disabled as of + # 2010-03-26, 3.1.6-1) + #for _lib in libQt{Core,Gui,Network,OpenGL}; do + # rm "${_lib}VBox.so.4" + # ln -s "/usr/lib/${_lib}.so.4" "${_lib}VBox.so.4" + #done + + # Install the SDK (disabled, since the extension expects an UCS4-compiled + # python, while Arch Linux has an UCS2-compiled python) + #cd "$pkgdir/opt/VirtualBox/sdk/installer" + #VBOX_INSTALL_PATH="/opt/VirtualBox" python vboxapisetup.py install --root "${pkgdir}" || return 1 + #rm -Rf build + #cd "$pkgdir/opt/VirtualBox" + rm -Rf sdk vboxshell.py VBoxPython* + + # Symlink the launchers + for _bin in VirtualBox VBox{Headless,Manage,SDL,SVC,Tunctl,NetAdpCtl} rdesktop-vrdp; do + ln -s "/opt/VirtualBox/${_bin}" "$pkgdir/usr/bin/${_bin}" + done + + # Symlink the desktop icon and ".desktop" files + ln -s "/opt/VirtualBox/VBox.png" "$pkgdir/usr/share/pixmaps/VBox.png" + ln -s "/opt/VirtualBox/virtualbox.desktop" "$pkgdir/usr/share/applications/VirtualBox.desktop" + + # Install vbox_build_module + install -Dm0744 "$srcdir/vbox_build_module" "$pkgdir/usr/bin/vbox_build_module" || return 1 + + # Replace some init scripts by simplified stuff + sed -i -e 's,sudo /etc/init.d/vboxdrv setup,/usr/bin/vbox_build_module,g' \ + "$pkgdir/opt/VirtualBox/VBox.sh" + sed -i -e 's,sudo /etc/init.d/vboxdrv restart,modprobe vboxdrv,g' \ + "$pkgdir/opt/VirtualBox/VBox.sh" + + # Install udev rules + install -Dm0644 "$srcdir/10-vboxdrv.rules" "$pkgdir/lib/udev/rules.d/10-vboxdrv.rules" || return 1 + + # Setup configuration + mkdir -p "$pkgdir/etc/vbox" || return 1 + echo 'INSTALL_DIR="/opt/VirtualBox"' > "$pkgdir/etc/vbox/vbox.cfg" + + # Symlink the license + mkdir -p "$pkgdir/usr/share/licenses/$pkgname" || return 1 + ln -s "/opt/VirtualBox/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/PUEL" +} diff --git a/virtualbox_bin/vbox.install b/virtualbox_bin/vbox.install new file mode 100644 index 0000000..c4615db --- /dev/null +++ b/virtualbox_bin/vbox.install @@ -0,0 +1,102 @@ +_install_notes() { + echo + echo '---------------------------------------------------------------------------' + echo ' IMPORTANT NOTES:' + echo + echo '- Run "vbox_build_module" as root every time your kernel is upgraded, to' + echo ' compile the module for the new kernel version.' + echo '- Add your user to the vboxusers group:' + echo ' gpasswd -a USERNAME vboxusers' + echo '- Add "vboxdrv" to the MODULES array in your "/etc/rc.conf"' + echo '- Add "vboxnetflt" to MODULES if you want Host Interface networking.' + echo '- Add "vboxnetadp" to MODULES if you want Host-Only networking.' + echo '- If USB does not work for you out-of-the-box, add the following line' + echo ' to "/etc/fstab":' + echo ' none /proc/bus/usb usbfs auto,busgid=108,busmode=0775,devgid=108,devmode=0664 0 0' + echo "---------------------------------------------------------------------------" +} + +# $1: The new package version +post_install() { + # Unload modules (if any). + for i in vboxdrv vboxnetadp vboxnetflt; do + modprobe -r $i &>/dev/null + done + + # Build new module + echo "Building VirtualBox modules..." + /usr/bin/vbox_build_module &>/dev/null + + # Add vboxusers group + # + # This GID is reserved (http://wiki.archlinux.org/index.php/UID_and_GID_list) + # But in some systems it may be being used. Please replace if needed. + groupadd -f -g 108 vboxusers + + # Create the directory below if it doesn't exist + mkdir -p /var/run/VirtualBox + + # Load new udev rule for module vboxdrv + udevadm control --reload-rules + + # Show the license + echo '---------------------------------------------------------------------------' >&2 + echo ' You must agree to the following license in order to use this program:' >&2 + echo >&2 + cat /opt/VirtualBox/LICENSE >&2 + echo >&2 + echo '---------------------------------------------------------------------------' >&2 + + # Load the new module + modprobe vboxdrv + + _install_notes +} + +# $1: The new package version +# $2: The old package version +post_upgrade() { + _NEWVERSION=`echo $1 | cut -f-1 -d '-'` + _OLDVERSION=`echo $2 | cut -f-1 -d '-'` + + # Unload modules (if any). + for i in vboxdrv vboxnetadp vboxnetflt; do + modprobe -r $i &>/dev/null + done + + # Remove any stuff (eg. module compilation files) from an + # old installation. Old versions used to use these directories. + if [ "$_NEWVERSION" != "$_OLDVERSION" ]; then + rm -Rf "/opt/VirtualBox-${_OLDVERSION}" &>/dev/null + fi + if [ "$1" != "$2" ]; then + rm -Rf "/opt/virtualbox" &>/dev/null + fi + + # Create the directory below if it doesn't exist + mkdir -p /var/run/VirtualBox + + # Build new module + echo "Building VirtualBox modules..." + /usr/bin/vbox_build_module &>/dev/null + + # Load the new module + modprobe vboxdrv + + _install_notes +} + +# $1: The old package version +pre_remove() { + # Unload modules (if any). + for i in vboxdrv vboxnetadp vboxnetflt; do + modprobe -r $i &>/dev/null + done + + # Remove the module files. + rm -f /lib/modules/`uname -r`/misc/{vboxdrv,vboxnetadp,vboxnetflt}.ko + + # Remove any stuff remaining from the module compilation. + rm -Rf "/opt/VirtualBox" +} + diff --git a/virtualbox_bin/vbox_build_module b/virtualbox_bin/vbox_build_module new file mode 100644 index 0000000..58e1e6b --- /dev/null +++ b/virtualbox_bin/vbox_build_module @@ -0,0 +1,5 @@ +#!/bin/bash + +echo "Building vboxdrv for `uname -sr`" +cd "/opt/VirtualBox/src" +make clean && make && make install diff --git a/virtualbox_bin/virtualbox.install b/virtualbox_bin/virtualbox.install new file mode 100644 index 0000000..6831b68 --- /dev/null +++ b/virtualbox_bin/virtualbox.install @@ -0,0 +1,100 @@ +_install_notes() { + echo + echo '---------------------------------------------------------------------------' + echo ' IMPORTANT NOTES:' + echo + echo '- Run "vbox_build_module" as root every time your kernel is upgraded, to' + echo ' compile the module for the new kernel version.' + echo '- Add your user to the vboxusers group:' + echo ' gpasswd -a USERNAME vboxusers' + echo '- Add "vboxdrv" to the MODULES array in your "/etc/rc.conf"' + echo '- Add "vboxnetflt" to MODULES if you want Host Interface networking.' + echo '- Add "vboxnetadp" to MODULES if you want Host-Only networking.' + echo '- If USB does not work for you out-of-the-box, add the following line' + echo ' to "/etc/fstab":' + echo ' none /proc/bus/usb usbfs auto,busgid=108,busmode=0775,devgid=108,devmode=0664 0 0' + echo "---------------------------------------------------------------------------" +} + +# $1: The new package version +post_install() { + # Unload modules (if any) + for _mod in vbox{drv,netadp,netflt}; do + modprobe -r $_mod &> /dev/null + done + + # Build new module + echo "Building VirtualBox modules..." + /usr/bin/vbox_build_module &> /dev/null + + # Add vboxusers group, GID 108 is reserved (http://wiki.archlinux.org/index.php/UID_and_GID_list), + # but in some systems it may be being used - please replace if needed. + groupadd -f -g 108 vboxusers + + # Create the directory below if it doesn't exist + mkdir -p "/var/run/VirtualBox" + + # Load new udev rule for module vboxdrv + udevadm control --reload-rules + + # Show the license + echo '---------------------------------------------------------------------------' >&2 + echo ' You must agree to the following license in order to use this program:' >&2 + echo >&2 + cat "/opt/VirtualBox/LICENSE" >&2 + echo >&2 + echo '---------------------------------------------------------------------------' >&2 + + # Load the new module + modprobe vboxdrv + + _install_notes +} + +# $1: The new package version +# $2: The old package version +post_upgrade() { + _NEWVERSION=`echo $1 | cut -f-1 -d '-'` + _OLDVERSION=`echo $2 | cut -f-1 -d '-'` + + # Unload modules (if any) + for _mod in vbox{drv,netadp,netflt}; do + modprobe -r $_mod &> /dev/null + done + + # Remove any stuff (e.g. module compilation files) from an old installation - old versions used + # to use these directories. + if [ "$_NEWVERSION" != "$_OLDVERSION" ]; then + rm -Rf "/opt/VirtualBox-${_OLDVERSION}" &> /dev/null + fi + if [ "$1" != "$2" ]; then + rm -Rf "/opt/virtualbox" &> /dev/null + fi + + # Create the directory below if it doesn't exist + mkdir -p "/var/run/VirtualBox" + + # Build new module + echo "Building VirtualBox modules..." + /usr/bin/vbox_build_module &> /dev/null + + # Load the new module + modprobe vboxdrv + + _install_notes +} + +# $1: The old package version +pre_remove() { + # Unload modules (if any) + for _mod in vbox{drv,netadp,netflt}; do + modprobe -r $_mod &> /dev/null + done + + # Remove the module files + rm -f "/lib/modules/`uname -r`/misc/"{vboxdrv,vboxnetadp,vboxnetflt}.ko + + # Remove any stuff remaining from the module compilation + rm -Rf "/opt/VirtualBox" +} + diff --git a/wireshark-cli/PKGBUILD b/wireshark-cli/PKGBUILD index 22b26ad..ff91ade 100644 --- a/wireshark-cli/PKGBUILD +++ b/wireshark-cli/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Florian "Bluewind" Pritz <flo@xssn.at> pkgname=wireshark-cli -pkgver=1.2.7 +pkgver=1.2.8 pkgrel=1 pkgdesc="A free network protocol analyzer for Unix/Linux and Windows - no GUI" arch=('i686' 'x86_64') @@ -26,7 +26,7 @@ build() { make all || return 1 make DESTDIR=${pkgdir} install || return 1 } -md5sums=('19e358386f7a07d0d225895588b6da6d' +md5sums=('0ccd311769ee3e290d285cbd979bff76' 'cc87d7eb31f256df751b3371b1c426e9') -sha1sums=('068e27540f56f4dec384422fb6258909b0426d6e' +sha1sums=('709e4d272de3f92914e17a65ee58d1a0e19852e9' '7a743a42542fa59423870a0205e8ed7aa6bde70e') diff --git a/yaourt/PKGBUILD b/yaourt/PKGBUILD new file mode 100644 index 0000000..6ba116d --- /dev/null +++ b/yaourt/PKGBUILD @@ -0,0 +1,25 @@ +# Author: Julien MISCHKOWITZ <wain@archlinux.fr> +# Author: tuxce <tuxce.net@gmail.com> +pkgname=yaourt +pkgver=0.9.3.2 +pkgrel=1 +pkgdesc="A Pacman frontend with more features and AUR support" +arch=(any) +url="http://www.archlinux.fr/yaourt-en/" +license="GPL" +depends=('wget' 'diffutils' 'pacman>=3.3.3' 'package-query') +makedepends=('gettext') +optdepends=('aurvote: vote for favorite packages from AUR for inclusion in [community]' + 'customizepkg: automatically modify PKGUILD during install/upgrade' + 'pacman-color: fully colorized output' + 'rsync: retrieve PKGBUILD from official repositories' + 'colordiff: colorized output with yaourt -C') +install=yaourt.install +backup=('etc/yaourtrc') +source=(http://archiwain.free.fr/os/i686/$pkgname/$pkgname-$pkgver.src.tar.gz) +md5sums=('349be19ecea6d1befd813014935e8772') + +build() { + cd $startdir/src/$pkgname-$pkgver + make install DESTDIR=$pkgdir || return 1 +} diff --git a/yaourt/yaourt.install b/yaourt/yaourt.install new file mode 100644 index 0000000..9bd680a --- /dev/null +++ b/yaourt/yaourt.install @@ -0,0 +1,14 @@ +post_install() { + cat <<-EndOfMessage + ==> to use yaourt as user,add these entries to /etc/sudoers: + user ALL=NOPASSWD: /usr/bin/pacman + user ALL=NOPASSWD: /usr/bin/pacdiffviewer + (Please, use sudo very carefully) + ==> for a full colorized output, install pacman-color and set PacmanBin in /etc/yaourtrc + EndOfMessage + /bin/true +} + +post_upgrade() { + post_install +} diff --git a/zsh-yaourt/PKGBUILD b/zsh-yaourt/PKGBUILD new file mode 100644 index 0000000..7872c67 --- /dev/null +++ b/zsh-yaourt/PKGBUILD @@ -0,0 +1,18 @@ +# Contributor: Jakub Ruzicka <yaccobb@centrum.cz> +# Contributor: Javier ‘Phrodo_00’ Aravena <phrodo.00@gmail.com> + +pkgname=zsh-yaourt +pkgver=0.2.3 +pkgrel=1 +pkgdesc="ZSH functions to tab-complete repo package names for yaourt" +url="http://bitbucket.org/Phrodo_00/zsh-yaourt" +depends=(zsh) +source=(_yaourt) +arch=('i686' 'x86_64') +license=('GPL') +md5sums=('59f0f4ef24e736b484d6e4788ef03c39') + +build() { + mkdir -p $startdir/pkg/usr/share/zsh/site-functions/ + install -m644 _yaourt $startdir/pkg/usr/share/zsh/site-functions/_yaourt +} diff --git a/zsh-yaourt/_yaourt b/zsh-yaourt/_yaourt new file mode 100644 index 0000000..d76c9a2 --- /dev/null +++ b/zsh-yaourt/_yaourt @@ -0,0 +1,344 @@ +#compdef yaourt + +# copy this file to /usr/share/zsh/site-functions/_yaourt + +typeset -A opt_args + +# options for passing to _arguments: main pacman commands +_yaourt_opts_commands=( + '-A[Add a package to the system]' + '-Q[Query the package database]' + '-R[Remove a package from the system]' + '-S[Synchronize packages]' + '-U[Upgrade a package]' + '-V[Display version and exit]' + '-h[Display usage]' + '-B[backup pacman database]' + '-G[Get PKGBUILD]' +) + +# options for passing to _arguments: options common to all commands +_yaourt_opts_common=( + '-b[Alternate database location]:database_location:_files -/' + '-h[Display syntax for the given operation]' + '-r[Set alternate installation root]:installation root:_files -/' + '-v[Be more verbose]' + '--cachedir[Alternate package cache location]:cache_location:_files -/' + '--config[An alternate configuration file]:config file:_files' + '--logfile[An alternate log file]:config file:_files' + '--noconfirm[Do not ask for confirmation]' + '--noprogressbar[Do not show a progress bar when downloading files]' + '--noscriptlet[Do not execute the install scriptlet if one exists]' +) + +# options for passing to _arguments: options for --add and --update commands +_yaourt_opts_pkgfile=( + '-d[Skip dependency checks]' + '-f[Overwrite conflicting files]' + '*:package file:_files -g "*.pkg.tar.*"' +) + +# options for passing to _arguments: subactions for --query command +_yaourt_opts_query_actions=( + '-g[View all members of a package group]:*:package groups:->query_group' + '-o[Query the package that owns a file]:file:_files' + '-p[Package file to query]:*:package file:->query_file' + '-s[Search package names and descriptions]:*:search text:->query_search' +) + +# options for passing to _arguments: options for --query and subcommands +_yaourt_opts_query_modifiers=( + '-c[List package changelog]' + '-d[List packages installed as dependencies]' + '-e[List packages explicitly installed]' + '-i[View package information]' + '-ii[View package information including backup files]' + '-l[List package contents]' + '-m[List installed packages not found in sync db(s)]' + '-t[List packages not required by any package]' + '-u[List packages that can be upgraded]' +) + +# options for passing to _arguments: options for --remove command +_yaourt_opts_remove=( + '-c[Remove all dependent packages]' + '-d[Skip dependency checks]' + '-k[Only remove database entry, do not remove files]' + '-n[Remove protected configuration files]' + '-s[Remove dependencies not required by other packages]' + '*:installed package:_yaourt_completions_installed_packages' +) + +# options for passing to _arguments: options for --sync command +_yaourt_opts_sync_actions=( + '*-c[Remove old packages from cache]:*:clean:->sync_clean' + '*-cc[Remove all packages from cache]:*:clean:->sync_clean' + '-g[View all members of a package group]:*:package groups:->sync_group' + '-s[Search package names and descriptions]:*:search text:->sync_search' +) + +# options for passing to _arguments: options for --sync command +_yaourt_opts_sync_modifiers=( + '-d[Skip dependency checks]' + '-e[Install dependencies only]' + '-f[Overwrite conflicting files]' + '-i[View package information]' + '-l[List all packages in a repository]' + '-p[Print download URIs for each package to be installed]' + '-u[Upgrade all out-of-date packages]' + '-w[Download packages only]' + '-y[Download fresh package databases]' + '*--ignore[Ignore a package upgrade]:package: + _yaourt_completions_all_packages' + '*--ignoregroup[Ignore a group upgrade]:package group: + _yaourt_completions_all_groups' + '--asdeps[Install packages as non-explicitly installed]' + '--aur[Install packages from aur, even if they are in community, or, with the -u option, update packages installed from aur]' + '--devel[Used with -u updates all cvs/svn/git/hg/bzr packages]' +) + +# handles --action subcommand +_yaourt_action_add() { + _arguments -s : \ + "$_yaourt_opts_common[@]" \ + "$_yaourt_opts_pkgfile[@]" +} + +# handles --help subcommand +_yaourt_action_help() { + _arguments -s : \ + "$_yaourt_opts_commands[@]" +} + +# handles cases where no subcommand has yet been given +_yaourt_action_none() { + _arguments -s : \ + "$_yaourt_opts_commands[@]" +} + +# handles --query subcommand +_yaourt_action_query() { + local context state line + typeset -A opt_args + +# _arguments -s : \ +# "$_yaourt_opts_common[@]" \ +# "$_yaourt_opts_query_actions[@]" \ +# "$_yaourt_opts_query_modifiers[@]" + + case $state in + query_file) + _arguments -s : \ + "$_yaourt_opts_common[@]" \ + "$_yaourt_opts_query_modifiers[@]" \ + '*:package file:_files -g "*.pkg.tar.*"' + ;; + query_group) + _arguments -s : \ + "$_yaourt_opts_common[@]" \ + "$_yaourt_opts_query_modifiers[@]" \ + '*:groups:_yaourt_completions_installed_groups' + ;; + query_owner) + _arguments -s : \ + "$_yaourt_opts_common[@]" \ + "$_yaourt_opts_query_modifiers[@]" \ + '*:file:_files' + ;; + query_search) + _arguments -s : \ + "$_yaourt_opts_common[@]" \ + "$_yaourt_opts_query_modifiers[@]" \ + '*:search text: ' + ;; + *) + _arguments -s : \ + "$_yaourt_opts_common[@]" \ + "$_yaourt_opts_query_actions[@]" \ + "$_yaourt_opts_query_modifiers[@]" \ + '*:package:_yaourt_completions_installed_packages' + ;; + esac +} + +# handles --remove subcommand +_yaourt_action_remove() { + _arguments -s : \ + "$_yaourt_opts_common[@]" \ + "$_yaourt_opts_remove[@]" +} + +# handles --sync subcommand +_yaourt_action_sync() { + local context state line + typeset -A opt_args + +# _arguments -s : \ +# "$_yaourt_opts_common[@]" \ +# "$_yaourt_opts_sync_actions[@]" #\ +# #"$_yaourt_opts_sync_modifiers[@]" + + case $state in + sync_clean) + _arguments -s : \ + "$_yaourt_opts_common[@]" \ + "$_yaourt_opts_sync_modifiers[@]" \ + '*-c[Remove old packages from cache]' \ + ;; + sync_group) + _arguments -s : \ + "$_yaourt_opts_common[@]" \ + "$_yaourt_opts_sync_modifiers[@]" \ + '*:package group:_yaourt_completions_all_groups' + ;; + sync_search) + _arguments -s : \ + "$_yaourt_opts_common[@]" \ + "$_yaourt_opts_sync_modifiers[@]" \ + '*:search text: ' + ;; + *) + _arguments -s : \ + "$_yaourt_opts_common[@]" \ + "$_yaourt_opts_sync_modifiers[@]" \ + '*:package:_yaourt_completions_all_packages' + ;; + esac +} + +# handles --upgrade subcommand +_yaourt_action_upgrade() { + _arguments -s : \ + "$_yaourt_opts_common[@]" \ + "$_yaourt_opts_pkgfile[@]" +} + +# handles --version subcommand +_yaourt_action_version() { + # no further arguments + return 0 +} + +# provides completions for package groups +_yaourt_completions_all_groups() { + local -a cmd groups + _yaourt_get_command + groups=( $(_call_program groups $cmd[@] -Sg) ) + compadd "$@" -a groups +} + +# provides completions for packages available from repositories +# these can be specified as either 'package' or 'repository/package' +_yaourt_completions_all_packages() { + local -a cmd packages repositories packages_long + + repositories=(${(o)${${${(M)${(f)"$(</etc/pacman.conf)"}:#\[*}/\[/}/\]/}:#options}) + typeset -U repositories + packages_long=(/var/lib/pacman/sync/${^repositories}/*(/)) + packages=(${(o)${${packages_long/\/var\/lib\/pacman\/sync\//}#*/}%-*-*} ) + typeset -U packages + _wanted packages expl "packages" compadd - "${(@)packages}" + if [[ $PREFIX != */* ]] ; then + repositories=(${(o)${${${(M)${(f)"$(</etc/pacman.conf)"}:#\[*}/\[/}/\]/}:#options}) + typeset -U repositories + _wanted repo_packages expl "repository/package" compadd -S "/" $repositories + else + compset -P '*/' + packages_long=(/var/lib/pacman/sync/$IPREFIX*(/)) + packages=(${(o)${${packages_long/\/var\/lib\/pacman\/sync\//}#*/}%-*-*} ) + typeset -U packages + _wanted repo_packages expl "repository/package" compadd ${(@)packages} + fi +} + +# provides completions for package groups +_yaourt_completions_installed_groups() { + local -a cmd groups + _yaourt_get_command + groups=(${(o)${(f)"$(pacman -Qg)"}% *}) + typeset -U groups + compadd "$@" -a groups +} + +# provides completions for installed packages +_yaourt_completions_installed_packages() { + local -a cmd packages packages_long + packages_long=(/var/lib/pacman/local/*(/)) + packages=( ${${packages_long/\/var\/lib\/pacman\/local\//}%-*-*} ) + compadd "$@" -a packages +} + +# provides completions for repository names +_yaourt_completions_repositories() { + local -a cmd repositories + repositories=(${(o)${${${(M)${(f)"$(</etc/pacman.conf)"}:#\[*}/\[/}/\]/}:#options}) + # Uniq the array + typeset -U repositories + compadd "$@" -a repositories +} + +# builds command for invoking pacman in a _call_program command - extracts +# relevant options already specified (config file, etc) +# $cmd must be declared by calling function +_yaourt_get_command() { + # this is mostly nicked from _perforce + cmd=( "pacman" ) + integer i + for (( i = 2; i < CURRENT - 1; i++ )); do + if [[ ${words[i]} = "--config" || ${words[i]} = "--root" ]]; then + cmd+=( ${words[i,i+1]} ) + fi + done +} + +# main dispatcher +_yaourt() { + case $words[2] in + -A*) _yaourt_action_add ;; + -Q*g*) # ipkg groups + _arguments -s : \ + "$_yaourt_opts_common[@]" \ + "$_yaourt_opts_query_modifiers[@]" \ + '*:groups:_yaourt_completions_installed_groups' + ;; + -Q*o*) # file + _arguments -s : \ + "$_yaourt_opts_common[@]" \ + "$_yaourt_opts_query_modifiers[@]" \ + '*:package file:_files' + ;; + -Q*p*) # file *.pkg.tar.* + _arguments -s : \ + "$_yaourt_opts_common[@]" \ + "$_yaourt_opts_query_modifiers[@]" \ + '*:package file:_files -g "*.pkg.tar.*"' + ;; + -Q*) _yaourt_action_query ;; + -R*) _yaourt_action_remove ;; + -S*c*) # no completion + return 0 + ;; + -S*l*) # repos + _arguments -s : \ + "$_yaourt_opts_common[@]" \ + "$_yaourt_opts_sync_modifiers[@]" \ + '*:package repo:_yaourt_completions_repositories' \ + ;; + -S*g*) # pkg groups + _arguments -s : \ + "$_yaourt_opts_common[@]" \ + "$_yaourt_opts_sync_modifiers[@]" \ + '*:package group:_yaourt_completions_all_groups' + ;; + -S*) _yaourt_action_sync ;; + -U*) _yaourt_action_upgrade ;; + -V*) _yaourt_action_version ;; + -h*) _yaourt_action_help ;; + - ) _yaourt_action_none ;; + * ) return 1 ;; + esac +} + +# run the main dispatcher +_yaourt "$@" + |