[arch-commits] Commit in gmic/repos (8 files)

Sergej Pupykin spupykin at nymeria.archlinux.org
Wed Mar 19 15:31:12 UTC 2014


    Date: Wednesday, March 19, 2014 @ 16:31:11
  Author: spupykin
Revision: 107782

archrelease: copy trunk to community-i686, community-x86_64

Added:
  gmic/repos/community-i686/PKGBUILD
    (from rev 107781, gmic/trunk/PKGBUILD)
  gmic/repos/community-i686/opencv-buildfix.patch
    (from rev 107781, gmic/trunk/opencv-buildfix.patch)
  gmic/repos/community-x86_64/PKGBUILD
    (from rev 107781, gmic/trunk/PKGBUILD)
  gmic/repos/community-x86_64/opencv-buildfix.patch
    (from rev 107781, 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

----------------------------------------+
 /PKGBUILD                              |  120 +++++++++++++++++++++++++++++++
 /opencv-buildfix.patch                 |   22 +++++
 community-i686/PKGBUILD                |   62 ----------------
 community-i686/opencv-buildfix.patch   |   20 -----
 community-x86_64/PKGBUILD              |   62 ----------------
 community-x86_64/opencv-buildfix.patch |   20 -----
 6 files changed, 142 insertions(+), 164 deletions(-)

Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD	2014-03-19 15:30:56 UTC (rev 107781)
+++ community-i686/PKGBUILD	2014-03-19 15:31:11 UTC (rev 107782)
@@ -1,62 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Maintainer: Jan "heftig" Steffens <jan.steffens at gmail.com>
-# Contributor: farid <farid at archlinuc-br.org>
-# Contributor: Archie <Mymaud at gmail.com>
-
-pkgbase=gmic
-pkgname=("gmic" "gimp-plugin-gmic" "zart")
-pkgver=1.5.8.3
-pkgrel=1
-arch=("i686" "x86_64")
-url="http://gmic.sourceforge.net"
-license=("custom:CeCILL")
-makedepends=('gimp' 'qt4' 'fftw' 'openexr' 'opencv' 'mesa' 'gtk2')
-#options=('!emptydirs')
-source=("http://downloads.sourceforge.net/sourceforge/gmic/gmic_${pkgver}.tar.gz"
-        "opencv-buildfix.patch")
-md5sums=('ee80a2dc1a2441a6c0adf92e9bea623b'
-         '120319b0d6c81c5af186abe2281b79ca')
-
-prepare() {
-  cd "${srcdir}/gmic-${pkgver}"
-  patch -p1 -i "${srcdir}/opencv-buildfix.patch"
-  sed -i 's|qmake zart.pro|qmake-qt4 zart.pro|g' src/Makefile
-  sed -i 's|/usr/bin/qmake|/usr/bin/qmake-qt4|g' zart/Makefile
-}
-
-build() {
-  cd "${srcdir}/gmic-${pkgver}"
-  make -C src all
-  make -C zart 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" "qt4")
-
-  cd "${srcdir}/gmic-${pkgver}"
-  install -Dm755 zart/zart "${pkgdir}/usr/bin/zart"
-  install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
-
-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 107781, gmic/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD	                        (rev 0)
+++ community-i686/PKGBUILD	2014-03-19 15:31:11 UTC (rev 107782)
@@ -0,0 +1,60 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Maintainer: Jan "heftig" Steffens <jan.steffens at gmail.com>
+# Contributor: farid <farid at archlinuc-br.org>
+# Contributor: Archie <Mymaud at gmail.com>
+
+pkgbase=gmic
+pkgname=("gmic" "gimp-plugin-gmic" "zart")
+pkgver=1.5.8.4
+pkgrel=1
+arch=("i686" "x86_64")
+url="http://gmic.sourceforge.net"
+license=("custom:CeCILL")
+makedepends=('gimp' 'qt4' 'fftw' 'openexr' 'opencv' 'mesa' 'gtk2')
+source=("http://downloads.sourceforge.net/sourceforge/gmic/gmic_${pkgver}.tar.gz")
+md5sums=('103ffe6606981c5d0bedaffd0f466bc2')
+
+prepare() {
+  cd "${srcdir}/gmic-${pkgver}"
+  sed -i -e 's|qmake zart.pro|qmake-qt4 zart.pro|g' \
+    -e 's|/etc/bash_completion.d|/usr/share/bash-completion/completions|g' \
+    src/Makefile
+}
+
+build() {
+  cd "${srcdir}/gmic-${pkgver}"
+  (cd zart && qmake-qt4 -o Makefile zart.pro)
+  make -C src all
+  make -C zart 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" "qt4")
+
+  cd "${srcdir}/gmic-${pkgver}"
+  install -Dm755 zart/zart "${pkgdir}/usr/bin/zart"
+  install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
+
+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	2014-03-19 15:30:56 UTC (rev 107781)
+++ community-i686/opencv-buildfix.patch	2014-03-19 15:31:11 UTC (rev 107782)
@@ -1,20 +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
- 

Copied: gmic/repos/community-i686/opencv-buildfix.patch (from rev 107781, gmic/trunk/opencv-buildfix.patch)
===================================================================
--- community-i686/opencv-buildfix.patch	                        (rev 0)
+++ community-i686/opencv-buildfix.patch	2014-03-19 15:31:11 UTC (rev 107782)
@@ -0,0 +1,11 @@
+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
+@@ -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	2014-03-19 15:30:56 UTC (rev 107781)
+++ community-x86_64/PKGBUILD	2014-03-19 15:31:11 UTC (rev 107782)
@@ -1,62 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Maintainer: Jan "heftig" Steffens <jan.steffens at gmail.com>
-# Contributor: farid <farid at archlinuc-br.org>
-# Contributor: Archie <Mymaud at gmail.com>
-
-pkgbase=gmic
-pkgname=("gmic" "gimp-plugin-gmic" "zart")
-pkgver=1.5.8.3
-pkgrel=1
-arch=("i686" "x86_64")
-url="http://gmic.sourceforge.net"
-license=("custom:CeCILL")
-makedepends=('gimp' 'qt4' 'fftw' 'openexr' 'opencv' 'mesa' 'gtk2')
-#options=('!emptydirs')
-source=("http://downloads.sourceforge.net/sourceforge/gmic/gmic_${pkgver}.tar.gz"
-        "opencv-buildfix.patch")
-md5sums=('ee80a2dc1a2441a6c0adf92e9bea623b'
-         '120319b0d6c81c5af186abe2281b79ca')
-
-prepare() {
-  cd "${srcdir}/gmic-${pkgver}"
-  patch -p1 -i "${srcdir}/opencv-buildfix.patch"
-  sed -i 's|qmake zart.pro|qmake-qt4 zart.pro|g' src/Makefile
-  sed -i 's|/usr/bin/qmake|/usr/bin/qmake-qt4|g' zart/Makefile
-}
-
-build() {
-  cd "${srcdir}/gmic-${pkgver}"
-  make -C src all
-  make -C zart 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" "qt4")
-
-  cd "${srcdir}/gmic-${pkgver}"
-  install -Dm755 zart/zart "${pkgdir}/usr/bin/zart"
-  install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
-
-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 107781, gmic/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/PKGBUILD	2014-03-19 15:31:11 UTC (rev 107782)
@@ -0,0 +1,60 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Maintainer: Jan "heftig" Steffens <jan.steffens at gmail.com>
+# Contributor: farid <farid at archlinuc-br.org>
+# Contributor: Archie <Mymaud at gmail.com>
+
+pkgbase=gmic
+pkgname=("gmic" "gimp-plugin-gmic" "zart")
+pkgver=1.5.8.4
+pkgrel=1
+arch=("i686" "x86_64")
+url="http://gmic.sourceforge.net"
+license=("custom:CeCILL")
+makedepends=('gimp' 'qt4' 'fftw' 'openexr' 'opencv' 'mesa' 'gtk2')
+source=("http://downloads.sourceforge.net/sourceforge/gmic/gmic_${pkgver}.tar.gz")
+md5sums=('103ffe6606981c5d0bedaffd0f466bc2')
+
+prepare() {
+  cd "${srcdir}/gmic-${pkgver}"
+  sed -i -e 's|qmake zart.pro|qmake-qt4 zart.pro|g' \
+    -e 's|/etc/bash_completion.d|/usr/share/bash-completion/completions|g' \
+    src/Makefile
+}
+
+build() {
+  cd "${srcdir}/gmic-${pkgver}"
+  (cd zart && qmake-qt4 -o Makefile zart.pro)
+  make -C src all
+  make -C zart 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" "qt4")
+
+  cd "${srcdir}/gmic-${pkgver}"
+  install -Dm755 zart/zart "${pkgdir}/usr/bin/zart"
+  install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
+
+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	2014-03-19 15:30:56 UTC (rev 107781)
+++ community-x86_64/opencv-buildfix.patch	2014-03-19 15:31:11 UTC (rev 107782)
@@ -1,20 +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
- 

Copied: gmic/repos/community-x86_64/opencv-buildfix.patch (from rev 107781, gmic/trunk/opencv-buildfix.patch)
===================================================================
--- community-x86_64/opencv-buildfix.patch	                        (rev 0)
+++ community-x86_64/opencv-buildfix.patch	2014-03-19 15:31:11 UTC (rev 107782)
@@ -0,0 +1,11 @@
+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
+@@ -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
+ 




More information about the arch-commits mailing list