Date: Friday, January 25, 2013 @ 18:29:35 Author: spupykin Revision: 82913
archrelease: copy trunk to community-i686, community-x86_64 Added: gmic/repos/community-i686/PKGBUILD (from rev 82912, gmic/trunk/PKGBUILD) gmic/repos/community-i686/opencv-buildfix.patch (from rev 82912, gmic/trunk/opencv-buildfix.patch) gmic/repos/community-x86_64/PKGBUILD (from rev 82912, gmic/trunk/PKGBUILD) gmic/repos/community-x86_64/opencv-buildfix.patch (from rev 82912, gmic/trunk/opencv-buildfix.patch) Deleted: gmic/repos/community-i686/PKGBUILD gmic/repos/community-i686/opencv-buildfix.patch gmic/repos/community-x86_64/PKGBUILD gmic/repos/community-x86_64/opencv-buildfix.patch ----------------------------------------+ community-i686/PKGBUILD | 116 +++++++++++++++---------------- community-i686/opencv-buildfix.patch | 52 +++++-------- community-x86_64/PKGBUILD | 116 +++++++++++++++---------------- community-x86_64/opencv-buildfix.patch | 52 +++++-------- 4 files changed, 156 insertions(+), 180 deletions(-) Deleted: community-i686/PKGBUILD =================================================================== --- community-i686/PKGBUILD 2013-01-25 17:29:15 UTC (rev 82912) +++ community-i686/PKGBUILD 2013-01-25 17:29:35 UTC (rev 82913) @@ -1,58 +0,0 @@ -# $Id$ -# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com> -# Maintainer: Jan "heftig" Steffens <jan.steff...@gmail.com> -# Contributor: farid <farid at archlinuc-br.org> -# Contributor: Archie <mym...@gmail.com> - -pkgbase=gmic -pkgname=("gmic" "gimp-plugin-gmic" "zart") -pkgver=1.5.1.8 -pkgrel=4 -arch=("i686" "x86_64") -url="http://gmic.sourceforge.net" -license=("custom:CeCILL") -makedepends=("gimp" "qt" "fftw" "openexr" "opencv") -#options=('!emptydirs') -source=("http://downloads.sourceforge.net/sourceforge/gmic/gmic_${pkgver}.tar.gz" - "opencv-buildfix.patch") -md5sums=('1fc38346269bdd829dd7c4864a27fbc3' - '8d1cf5000239099255d25c7d3dbe5728') - -build() { - cd "${srcdir}/gmic-${pkgver}" - patch -p1 -i "${srcdir}/opencv-buildfix.patch" - find "${srcdir}/gmic-${pkgver}/zart" -type f -execdir chmod 644 '{}' \; - find "${srcdir}/gmic-${pkgver}/zart" -type d -execdir chmod 755 '{}' \; - make -C src all -} - -package_gmic() { - pkgdesc="GREYC's Magic Image Converter: image processing framework" - depends=("fftw" "libtiff" "libjpeg" "libpng" "openexr" "libx11") - replaces=("greycstoration") - - cd "${srcdir}/gmic-${pkgver}" - make -C src install DESTDIR="$pkgdir" USR="/usr" - install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" - rm -rf "${pkgdir}/usr/"{bin/zart,lib/gimp,share/zart} -} - -package_zart() { - pkgdesc="A GUI for G'MIC real-time manipulations on the output of a webcam" - depends=("opencv" "fftw" "qt") - - cd "${srcdir}/gmic-${pkgver}" - make -C src install DESTDIR="$pkgdir" USR="/usr" - install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" - rm -rf "${pkgdir}/usr/"{bin/gmic,include,lib,share/{man,bash-completion}} -} - -package_gimp-plugin-gmic() { - pkgdesc="Gimp plugin for the G'MIC image processing framework" - depends=("gimp" "fftw") - replaces=("gimp-plugin-greycstoration" "gimp-plugin-gmic4gimp") - - cd "${srcdir}/gmic-${pkgver}" - install -Dm755 src/gmic_gimp "${pkgdir}/usr/lib/gimp/2.0/plug-ins/gmic_gimp" - install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} Copied: gmic/repos/community-i686/PKGBUILD (from rev 82912, gmic/trunk/PKGBUILD) =================================================================== --- community-i686/PKGBUILD (rev 0) +++ community-i686/PKGBUILD 2013-01-25 17:29:35 UTC (rev 82913) @@ -0,0 +1,58 @@ +# $Id$ +# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com> +# Maintainer: Jan "heftig" Steffens <jan.steff...@gmail.com> +# Contributor: farid <farid at archlinuc-br.org> +# Contributor: Archie <mym...@gmail.com> + +pkgbase=gmic +pkgname=("gmic" "gimp-plugin-gmic" "zart") +pkgver=1.5.3.0 +pkgrel=1 +arch=("i686" "x86_64") +url="http://gmic.sourceforge.net" +license=("custom:CeCILL") +makedepends=("gimp" "qt" "fftw" "openexr" "opencv") +#options=('!emptydirs') +source=("http://downloads.sourceforge.net/sourceforge/gmic/gmic_${pkgver}.tar.gz" + "opencv-buildfix.patch") +md5sums=('2b3c385d727556d201767d338d97946f' + '120319b0d6c81c5af186abe2281b79ca') + +build() { + cd "${srcdir}/gmic-${pkgver}" + patch -p1 -i "${srcdir}/opencv-buildfix.patch" + find "${srcdir}/gmic-${pkgver}/zart" -type f -execdir chmod 644 '{}' \; + find "${srcdir}/gmic-${pkgver}/zart" -type d -execdir chmod 755 '{}' \; + make -C src all +} + +package_gmic() { + pkgdesc="GREYC's Magic Image Converter: image processing framework" + depends=("fftw" "libtiff" "libjpeg" "libpng" "openexr" "libx11") + replaces=("greycstoration") + + cd "${srcdir}/gmic-${pkgver}" + make -C src install DESTDIR="$pkgdir" USR="/usr" + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + rm -rf "${pkgdir}/usr/"{bin/zart,lib/gimp,share/zart} +} + +package_zart() { + pkgdesc="A GUI for G'MIC real-time manipulations on the output of a webcam" + depends=("opencv" "fftw" "qt") + + cd "${srcdir}/gmic-${pkgver}" + make -C src install DESTDIR="$pkgdir" USR="/usr" + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + rm -rf "${pkgdir}/usr/"{bin/gmic,include,lib,share/{man,bash-completion}} +} + +package_gimp-plugin-gmic() { + pkgdesc="Gimp plugin for the G'MIC image processing framework" + depends=("gimp" "fftw") + replaces=("gimp-plugin-greycstoration" "gimp-plugin-gmic4gimp") + + cd "${srcdir}/gmic-${pkgver}" + install -Dm755 src/gmic_gimp "${pkgdir}/usr/lib/gimp/2.0/plug-ins/gmic_gimp" + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} Deleted: community-i686/opencv-buildfix.patch =================================================================== --- community-i686/opencv-buildfix.patch 2013-01-25 17:29:15 UTC (rev 82912) +++ community-i686/opencv-buildfix.patch 2013-01-25 17:29:35 UTC (rev 82913) @@ -1,32 +0,0 @@ -diff -wbBur gmic-1.5.1.7/src/Makefile gmic-1.5.1.7.q/src/Makefile ---- gmic-1.5.1.7/src/Makefile 2012-07-26 12:59:34.000000000 +0400 -+++ gmic-1.5.1.7.q/src/Makefile 2012-08-03 14:03:10.000000000 +0400 -@@ -296,7 +296,7 @@ - - zart: lib - ifneq ($(OS),Darwin) -- cd ../zart && qmake-qt4 zart.pro && $(MAKE) && strip zart -+ cd ../zart && qmake zart.pro && $(MAKE) && strip zart - else - cd ../zart && qmake zart.pro && $(MAKE) "CFLAGS=$(STD_MACOSX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS=$(STD_MACOSX_LDFLAGS) $(OPT_LDFLAGS)" - endif -@@ -403,6 +403,7 @@ - mkdir -p $(DESTDIR)$(USR)/share/man/fr/man1/ - cp -f ../man/gmic.1.gz $(DESTDIR)$(USR)/share/man/man1/gmic.1.gz - cp -f ../man/gmic.1.gz $(DESTDIR)$(USR)/share/man/fr/man1/gmic.1.gz -+ if test -d /usr/share/bash-completion/completions; then mkdir -p $(DESTDIR)/usr/share/bash-completion/completions/; cp -f gmic_bashcompletion.sh $(DESTDIR)/usr/share/bash-completion/completions/gmic; fi - if test -d /etc/bash_completion.d/; then mkdir -p $(DESTDIR)/etc/bash_completion.d/; cp -f gmic_bashcompletion.sh $(DESTDIR)/etc/bash_completion.d/gmic; fi - if test -d /opt/local/etc/bash_completion.d/; then mkdir -p $(DESTDIR)/opt/local/etc/bash_completion.d/; cp -f gmic_bashcompletion.sh $(DESTDIR)/opt/local/etc/bash_completion.d/gmic; fi - -diff -wbBur gmic-1.5.1.7/zart/zart.pro gmic-1.5.1.7.q/zart/zart.pro ---- gmic-1.5.1.7/zart/zart.pro 2012-07-26 12:59:33.000000000 +0400 -+++ gmic-1.5.1.7.q/zart/zart.pro 2012-08-03 12:32:27.000000000 +0400 -@@ -34,7 +34,7 @@ - FORMS = ui/MainWindow.ui ui/DialogAbout.ui ui/DialogLicence.ui - - !macx { -- LIBS += -lX11 ../src/libgmic.a -lcxcore -lcv -lml -lhighgui -lml -lfftw3 -+ LIBS += -lX11 ../src/libgmic.a `pkg-config --libs opencv` -lopencv_core -lopencv_ml -lopencv_highgui -lfftw3 - } else { - LIBS += -lX11 ../src/libgmic.a `pkg-config opencv --libs` -lfftw3 - } Copied: gmic/repos/community-i686/opencv-buildfix.patch (from rev 82912, gmic/trunk/opencv-buildfix.patch) =================================================================== --- community-i686/opencv-buildfix.patch (rev 0) +++ community-i686/opencv-buildfix.patch 2013-01-25 17:29:35 UTC (rev 82913) @@ -0,0 +1,20 @@ +diff -wbBur gmic-1.5.1.7/src/Makefile gmic-1.5.1.7.q/src/Makefile +--- gmic-1.5.1.7/src/Makefile 2012-07-26 12:59:34.000000000 +0400 ++++ gmic-1.5.1.7.q/src/Makefile 2012-08-03 14:03:10.000000000 +0400 +@@ -296,7 +296,7 @@ + + zart: lib + ifneq ($(OS),Darwin) +- cd ../zart && qmake-qt4 zart.pro && $(MAKE) && strip zart ++ cd ../zart && qmake zart.pro && $(MAKE) && strip zart + else + cd ../zart && qmake zart.pro && $(MAKE) "CFLAGS=$(STD_MACOSX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS=$(STD_MACOSX_LDFLAGS) $(OPT_LDFLAGS)" + endif +@@ -403,6 +403,7 @@ + mkdir -p $(DESTDIR)$(USR)/share/man/fr/man1/ + cp -f ../man/gmic.1.gz $(DESTDIR)$(USR)/share/man/man1/gmic.1.gz + cp -f ../man/gmic.1.gz $(DESTDIR)$(USR)/share/man/fr/man1/gmic.1.gz ++ if test -d /usr/share/bash-completion/completions; then mkdir -p $(DESTDIR)/usr/share/bash-completion/completions/; cp -f gmic_bashcompletion.sh $(DESTDIR)/usr/share/bash-completion/completions/gmic; fi + if test -d /etc/bash_completion.d/; then mkdir -p $(DESTDIR)/etc/bash_completion.d/; cp -f gmic_bashcompletion.sh $(DESTDIR)/etc/bash_completion.d/gmic; fi + if test -d /opt/local/etc/bash_completion.d/; then mkdir -p $(DESTDIR)/opt/local/etc/bash_completion.d/; cp -f gmic_bashcompletion.sh $(DESTDIR)/opt/local/etc/bash_completion.d/gmic; fi + Deleted: community-x86_64/PKGBUILD =================================================================== --- community-x86_64/PKGBUILD 2013-01-25 17:29:15 UTC (rev 82912) +++ community-x86_64/PKGBUILD 2013-01-25 17:29:35 UTC (rev 82913) @@ -1,58 +0,0 @@ -# $Id$ -# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com> -# Maintainer: Jan "heftig" Steffens <jan.steff...@gmail.com> -# Contributor: farid <farid at archlinuc-br.org> -# Contributor: Archie <mym...@gmail.com> - -pkgbase=gmic -pkgname=("gmic" "gimp-plugin-gmic" "zart") -pkgver=1.5.1.8 -pkgrel=4 -arch=("i686" "x86_64") -url="http://gmic.sourceforge.net" -license=("custom:CeCILL") -makedepends=("gimp" "qt" "fftw" "openexr" "opencv") -#options=('!emptydirs') -source=("http://downloads.sourceforge.net/sourceforge/gmic/gmic_${pkgver}.tar.gz" - "opencv-buildfix.patch") -md5sums=('1fc38346269bdd829dd7c4864a27fbc3' - '8d1cf5000239099255d25c7d3dbe5728') - -build() { - cd "${srcdir}/gmic-${pkgver}" - patch -p1 -i "${srcdir}/opencv-buildfix.patch" - find "${srcdir}/gmic-${pkgver}/zart" -type f -execdir chmod 644 '{}' \; - find "${srcdir}/gmic-${pkgver}/zart" -type d -execdir chmod 755 '{}' \; - make -C src all -} - -package_gmic() { - pkgdesc="GREYC's Magic Image Converter: image processing framework" - depends=("fftw" "libtiff" "libjpeg" "libpng" "openexr" "libx11") - replaces=("greycstoration") - - cd "${srcdir}/gmic-${pkgver}" - make -C src install DESTDIR="$pkgdir" USR="/usr" - install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" - rm -rf "${pkgdir}/usr/"{bin/zart,lib/gimp,share/zart} -} - -package_zart() { - pkgdesc="A GUI for G'MIC real-time manipulations on the output of a webcam" - depends=("opencv" "fftw" "qt") - - cd "${srcdir}/gmic-${pkgver}" - make -C src install DESTDIR="$pkgdir" USR="/usr" - install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" - rm -rf "${pkgdir}/usr/"{bin/gmic,include,lib,share/{man,bash-completion}} -} - -package_gimp-plugin-gmic() { - pkgdesc="Gimp plugin for the G'MIC image processing framework" - depends=("gimp" "fftw") - replaces=("gimp-plugin-greycstoration" "gimp-plugin-gmic4gimp") - - cd "${srcdir}/gmic-${pkgver}" - install -Dm755 src/gmic_gimp "${pkgdir}/usr/lib/gimp/2.0/plug-ins/gmic_gimp" - install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} Copied: gmic/repos/community-x86_64/PKGBUILD (from rev 82912, gmic/trunk/PKGBUILD) =================================================================== --- community-x86_64/PKGBUILD (rev 0) +++ community-x86_64/PKGBUILD 2013-01-25 17:29:35 UTC (rev 82913) @@ -0,0 +1,58 @@ +# $Id$ +# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com> +# Maintainer: Jan "heftig" Steffens <jan.steff...@gmail.com> +# Contributor: farid <farid at archlinuc-br.org> +# Contributor: Archie <mym...@gmail.com> + +pkgbase=gmic +pkgname=("gmic" "gimp-plugin-gmic" "zart") +pkgver=1.5.3.0 +pkgrel=1 +arch=("i686" "x86_64") +url="http://gmic.sourceforge.net" +license=("custom:CeCILL") +makedepends=("gimp" "qt" "fftw" "openexr" "opencv") +#options=('!emptydirs') +source=("http://downloads.sourceforge.net/sourceforge/gmic/gmic_${pkgver}.tar.gz" + "opencv-buildfix.patch") +md5sums=('2b3c385d727556d201767d338d97946f' + '120319b0d6c81c5af186abe2281b79ca') + +build() { + cd "${srcdir}/gmic-${pkgver}" + patch -p1 -i "${srcdir}/opencv-buildfix.patch" + find "${srcdir}/gmic-${pkgver}/zart" -type f -execdir chmod 644 '{}' \; + find "${srcdir}/gmic-${pkgver}/zart" -type d -execdir chmod 755 '{}' \; + make -C src all +} + +package_gmic() { + pkgdesc="GREYC's Magic Image Converter: image processing framework" + depends=("fftw" "libtiff" "libjpeg" "libpng" "openexr" "libx11") + replaces=("greycstoration") + + cd "${srcdir}/gmic-${pkgver}" + make -C src install DESTDIR="$pkgdir" USR="/usr" + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + rm -rf "${pkgdir}/usr/"{bin/zart,lib/gimp,share/zart} +} + +package_zart() { + pkgdesc="A GUI for G'MIC real-time manipulations on the output of a webcam" + depends=("opencv" "fftw" "qt") + + cd "${srcdir}/gmic-${pkgver}" + make -C src install DESTDIR="$pkgdir" USR="/usr" + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + rm -rf "${pkgdir}/usr/"{bin/gmic,include,lib,share/{man,bash-completion}} +} + +package_gimp-plugin-gmic() { + pkgdesc="Gimp plugin for the G'MIC image processing framework" + depends=("gimp" "fftw") + replaces=("gimp-plugin-greycstoration" "gimp-plugin-gmic4gimp") + + cd "${srcdir}/gmic-${pkgver}" + install -Dm755 src/gmic_gimp "${pkgdir}/usr/lib/gimp/2.0/plug-ins/gmic_gimp" + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} Deleted: community-x86_64/opencv-buildfix.patch =================================================================== --- community-x86_64/opencv-buildfix.patch 2013-01-25 17:29:15 UTC (rev 82912) +++ community-x86_64/opencv-buildfix.patch 2013-01-25 17:29:35 UTC (rev 82913) @@ -1,32 +0,0 @@ -diff -wbBur gmic-1.5.1.7/src/Makefile gmic-1.5.1.7.q/src/Makefile ---- gmic-1.5.1.7/src/Makefile 2012-07-26 12:59:34.000000000 +0400 -+++ gmic-1.5.1.7.q/src/Makefile 2012-08-03 14:03:10.000000000 +0400 -@@ -296,7 +296,7 @@ - - zart: lib - ifneq ($(OS),Darwin) -- cd ../zart && qmake-qt4 zart.pro && $(MAKE) && strip zart -+ cd ../zart && qmake zart.pro && $(MAKE) && strip zart - else - cd ../zart && qmake zart.pro && $(MAKE) "CFLAGS=$(STD_MACOSX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS=$(STD_MACOSX_LDFLAGS) $(OPT_LDFLAGS)" - endif -@@ -403,6 +403,7 @@ - mkdir -p $(DESTDIR)$(USR)/share/man/fr/man1/ - cp -f ../man/gmic.1.gz $(DESTDIR)$(USR)/share/man/man1/gmic.1.gz - cp -f ../man/gmic.1.gz $(DESTDIR)$(USR)/share/man/fr/man1/gmic.1.gz -+ if test -d /usr/share/bash-completion/completions; then mkdir -p $(DESTDIR)/usr/share/bash-completion/completions/; cp -f gmic_bashcompletion.sh $(DESTDIR)/usr/share/bash-completion/completions/gmic; fi - if test -d /etc/bash_completion.d/; then mkdir -p $(DESTDIR)/etc/bash_completion.d/; cp -f gmic_bashcompletion.sh $(DESTDIR)/etc/bash_completion.d/gmic; fi - if test -d /opt/local/etc/bash_completion.d/; then mkdir -p $(DESTDIR)/opt/local/etc/bash_completion.d/; cp -f gmic_bashcompletion.sh $(DESTDIR)/opt/local/etc/bash_completion.d/gmic; fi - -diff -wbBur gmic-1.5.1.7/zart/zart.pro gmic-1.5.1.7.q/zart/zart.pro ---- gmic-1.5.1.7/zart/zart.pro 2012-07-26 12:59:33.000000000 +0400 -+++ gmic-1.5.1.7.q/zart/zart.pro 2012-08-03 12:32:27.000000000 +0400 -@@ -34,7 +34,7 @@ - FORMS = ui/MainWindow.ui ui/DialogAbout.ui ui/DialogLicence.ui - - !macx { -- LIBS += -lX11 ../src/libgmic.a -lcxcore -lcv -lml -lhighgui -lml -lfftw3 -+ LIBS += -lX11 ../src/libgmic.a `pkg-config --libs opencv` -lopencv_core -lopencv_ml -lopencv_highgui -lfftw3 - } else { - LIBS += -lX11 ../src/libgmic.a `pkg-config opencv --libs` -lfftw3 - } Copied: gmic/repos/community-x86_64/opencv-buildfix.patch (from rev 82912, gmic/trunk/opencv-buildfix.patch) =================================================================== --- community-x86_64/opencv-buildfix.patch (rev 0) +++ community-x86_64/opencv-buildfix.patch 2013-01-25 17:29:35 UTC (rev 82913) @@ -0,0 +1,20 @@ +diff -wbBur gmic-1.5.1.7/src/Makefile gmic-1.5.1.7.q/src/Makefile +--- gmic-1.5.1.7/src/Makefile 2012-07-26 12:59:34.000000000 +0400 ++++ gmic-1.5.1.7.q/src/Makefile 2012-08-03 14:03:10.000000000 +0400 +@@ -296,7 +296,7 @@ + + zart: lib + ifneq ($(OS),Darwin) +- cd ../zart && qmake-qt4 zart.pro && $(MAKE) && strip zart ++ cd ../zart && qmake zart.pro && $(MAKE) && strip zart + else + cd ../zart && qmake zart.pro && $(MAKE) "CFLAGS=$(STD_MACOSX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS=$(STD_MACOSX_LDFLAGS) $(OPT_LDFLAGS)" + endif +@@ -403,6 +403,7 @@ + mkdir -p $(DESTDIR)$(USR)/share/man/fr/man1/ + cp -f ../man/gmic.1.gz $(DESTDIR)$(USR)/share/man/man1/gmic.1.gz + cp -f ../man/gmic.1.gz $(DESTDIR)$(USR)/share/man/fr/man1/gmic.1.gz ++ if test -d /usr/share/bash-completion/completions; then mkdir -p $(DESTDIR)/usr/share/bash-completion/completions/; cp -f gmic_bashcompletion.sh $(DESTDIR)/usr/share/bash-completion/completions/gmic; fi + if test -d /etc/bash_completion.d/; then mkdir -p $(DESTDIR)/etc/bash_completion.d/; cp -f gmic_bashcompletion.sh $(DESTDIR)/etc/bash_completion.d/gmic; fi + if test -d /opt/local/etc/bash_completion.d/; then mkdir -p $(DESTDIR)/opt/local/etc/bash_completion.d/; cp -f gmic_bashcompletion.sh $(DESTDIR)/opt/local/etc/bash_completion.d/gmic; fi +