summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--libre-multilib/lib32-mesa-libcl/PKGBUILD5
-rw-r--r--libre-testing/libretools/PKGBUILD108
-rw-r--r--libre-testing/libretools/libretools.install72
-rw-r--r--libre/libretools/PKGBUILD2
-rw-r--r--pcr/imagemagick-nox/PKGBUILD (renamed from pcr/imagemagick-srv/PKGBUILD)63
-rw-r--r--pcr/imagemagick-nox/perlmagick.rpath.patch (renamed from pcr/imagemagick-srv/perlmagick.rpath.patch)0
6 files changed, 222 insertions, 28 deletions
diff --git a/libre-multilib/lib32-mesa-libcl/PKGBUILD b/libre-multilib/lib32-mesa-libcl/PKGBUILD
index fdbd8fe0d..0c2424e2d 100644
--- a/libre-multilib/lib32-mesa-libcl/PKGBUILD
+++ b/libre-multilib/lib32-mesa-libcl/PKGBUILD
@@ -6,7 +6,7 @@ _pkgname=libcl
pkgname=lib32-$pkgbase-$_pkgname
_pkgflag=libre
pkgver=10.2.2
-pkgrel=2
+pkgrel=1
pkgdesc='Mesa 3-D OpenCL library (32-bit)'
url=http://${pkgbase}3d.sourceforge.net
license=(
@@ -83,9 +83,6 @@ build() {
package() {
cd $srcdir/${pkgbase^}-$pkgver
make -C src/gallium/targets/opencl DESTDIR=$pkgdir install
- ln -sv libMesaOpenCL.so.1.0.0 $pkgdir/usr/lib32/libOpenCL.so
- ln -sv libMesaOpenCL.so.1.0.0 $pkgdir/usr/lib32/libOpenCL.so.1
- ln -sv libMesaOpenCL.so.1.0.0 $pkgdir/usr/lib32/libOpenCL.so.1.0.0
install -vdm755 $pkgdir/usr/share/licenses/$pkgname
install -vm644 docs/COPYING $pkgdir/usr/share/licenses/$pkgname
install -vm644 docs/license.html $pkgdir/usr/share/licenses/$pkgname/LICENSE
diff --git a/libre-testing/libretools/PKGBUILD b/libre-testing/libretools/PKGBUILD
new file mode 100644
index 000000000..a034a412b
--- /dev/null
+++ b/libre-testing/libretools/PKGBUILD
@@ -0,0 +1,108 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+# Contributor: Joshua Ismael Haase Hernández (xihh) <hahj87@gmail.com>
+# Contributor: fauno <fauno@kiwwwi.com.ar>
+# Contributor: Márcio Silva <coadde@parabola.nu>
+
+pkgbase=libretools
+pkgname=(libretools libretools-mips64el librelib gitget xbs)
+pkgdesc="Programs for Parabola development"
+url="https://projects.parabolagnulinux.org/packages/libretools.git/"
+license=('GPL3' 'GPL2')
+
+pkgver=20140630
+_libretools_commit=5a84f3c84a1f3275f5b3ab51b1cf90327f52b9b2
+_devtools_commit=d732aae2ca57430f3dd95c0ed4dcc05df4014f91
+md5sums=('14a272e6b69c05493b16d84a247a1e17'
+ '615db785531757d3a849614bb117fba4')
+
+_packages_url=https://projects.parabolagnulinux.org/packages
+source=($_packages_url/libretools.git/snapshot/libretools-$_libretools_commit.tar.bz2
+ $_packages_url/devtools-par.git/snapshot/devtools-par-$_devtools_commit.tar.bz2)
+
+pkgrel=1
+arch=('any')
+makedepends=(emacs ronn) # emacs --batch is used during the build to process text
+checkdepends=(sh-roundup)
+
+build() {
+ cd "$srcdir"
+ ln -sf devtools-par-$_devtools_commit devtools-par
+ cd "$srcdir/$pkgbase-$_libretools_commit"
+ make build-libretools build-libretools-mips64el build-librelib build-doc
+}
+
+check() {
+ cd "$srcdir/$pkgbase-$_libretools_commit"
+
+ SUDO_USER= make check TESTENVFLAGS='--no-network --no-sudo'
+}
+
+package_librelib() {
+ pkgdesc="The shell library portion of libretools"
+ license=(GPL2)
+ depends=(
+ wget # `blacklist`
+ )
+
+ cd "$srcdir/$pkgbase-$_libretools_commit"
+ make install-librelib DESTDIR="$pkgdir"
+}
+
+package_gitget() {
+ pkgdesc="A simple to use downloader for git URLs"
+ license=(GPL2)
+ depends=("librelib=$pkgver" git)
+
+ provides=("libregit=$pkgver")
+ conflicts=("libregit")
+ replaces=("libregit")
+
+ cd "$srcdir/$pkgbase-$_libretools_commit"
+ make install-gitget DESTDIR="$pkgdir"
+}
+
+package_xbs() {
+ pkgdesc='A tool for working with arbitrary ABS-like build systems'
+ license=(GPL2)
+ depends=(
+ "gitget=$pkgver" # for helper-abslibre
+ "librelib=$pkgver"
+ )
+
+ cd "$srcdir/$pkgbase-$_libretools_commit"
+ make install-xbs DESTDIR="$pkgdir"
+}
+
+package_libretools() {
+ backup=(etc/libretools.conf etc/libretools.d/chroot.conf etc/libretools.d/librefetch.conf)
+ install=libretools.install
+ replaces=(chroottools)
+ conflicts=(devtools chroottools)
+
+ depends=(
+ "librelib=$pkgver"
+ "xbs=$pkgver" # `createworkdir`, `librestage`
+ "systemd>=212" # force newer systemd
+ arch-install-scripts # `archroot` uses `pacstrap`
+ openssh # `librerelease`
+ rsync # `librerelease` and `makechrootpkg.sh`
+ subversion # `diff-unfree`
+ tokyocabinet # `treepkg`
+ wget # `aur`
+ )
+ optdepends=('namcap: to check package files')
+
+ cd "$srcdir/$pkgbase-$_libretools_commit"
+ make install-libretools install-doc DESTDIR="$pkgdir"
+}
+
+package_libretools-mips64el() {
+ pkgdesc="Scripts for Parabola development (for mips64el architecture)"
+ license=(GPL3)
+ depends=("$pkgbase=$pkgver"
+ git # mips-add
+ )
+
+ cd "$srcdir/$pkgbase-$_libretools_commit"
+ make install-libretools-mips64el DESTDIR="$pkgdir"
+}
diff --git a/libre-testing/libretools/libretools.install b/libre-testing/libretools/libretools.install
new file mode 100644
index 000000000..35edf68c7
--- /dev/null
+++ b/libre-testing/libretools/libretools.install
@@ -0,0 +1,72 @@
+#!/bin/sh
+
+_edit_code=" 'https::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 -o %o %u'"
+_edit_cmnt='#%s # commented out by the libretools post_install script'
+
+_add_cmnt='# The following line is added by the libretools post_install script'
+_add_code='DLAGENTS+=({https,libre}'\''::/usr/bin/librefetch -p "$BUILDFILE" -- %u %o'\'')'
+
+# These lines were installed by previous versions of this script
+_old_code=(
+ '[[ ! -x /usr/bin/librefetch ]] || DLAGENTS+=("libre::/usr/bin/librefetch -p \"\$BUILDFILE\" %u %o")'
+ '[[ ! -x /usr/bin/librefetch ]] || DLAGENTS+=({https,libre}"::/usr/bin/librefetch -p \"\$BUILDFILE\" -- %u %o")'
+ 'DLAGENTS+=({https,libre}"::/usr/bin/librefetch -p $(printf "%q" "$BUILDFILE") -- %u %o")'
+)
+
+# has_line $line
+has_line() { grep -Fxq -- "$1" etc/makepkg.conf; }
+# add_line $line
+add_line() { printf '%s\n' "$1" >> etc/makepkg.conf; }
+# del_line $line
+del_line() {
+ local lineno=($(grep -Fxn -- "$1" etc/makepkg.conf | cut -d: -f1))
+ if [[ "${#lineno[@]}" -gt 0 ]]; then
+ sed -i "$(printf '%dd;' "${lineno[@]}")" etc/makepkg.conf;
+ fi
+}
+# rep_line $orig $replacement_bre
+rep_line() {
+ local lineno=($(grep -Fxn -- "$1" etc/makepkg.conf | cut -d: -f1))
+ if [[ "${#lineno[@]}" == 1 ]]; then
+ sed -i "${lineno}s|.*|${2//|/\\|}|" etc/makepkg.conf;
+ fi
+}
+
+# arg 1: the new package version
+post_install() {
+ if grep -q 'librefetch' etc/makepkg.conf; then
+ libremessages msg2 "libretools: librefetch is already in /etc/makepkg.conf"
+ local line del=false
+ for line in "${_old_code[@]}"; do
+ if has_line "$line"; then
+ pre_remove
+ post_install
+ return $?
+ fi
+ done
+ else
+ libremessages msg2 "libretools: adding librefetch to /etc/makepkg.conf"
+ rep_line "$_edit_code" "$(printf "$_edit_cmnt" '&')"
+ add_line "$_add_cmnt"
+ add_line "$_add_code"
+ fi
+}
+
+## arg 1: the new package version
+## arg 2: the old package version
+post_upgrade() {
+ post_install
+}
+
+pre_remove() {
+ libremessages msg2 "libretools: removing librefetch from /etc/makepkg.conf"
+
+ rep_line "$(printf "$_edit_cmnt" "$_edit_code")" "$_edit_code"
+ del_line "$_add_cmnt"
+ del_line "$_add_code"
+
+ local line
+ for line in "${_old_code[@]}"; do
+ del_line "$line"
+ done
+}
diff --git a/libre/libretools/PKGBUILD b/libre/libretools/PKGBUILD
index f1fdd8ebf..5e4a3267a 100644
--- a/libre/libretools/PKGBUILD
+++ b/libre/libretools/PKGBUILD
@@ -1,5 +1,5 @@
# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-# Contributor (Arch): Joshua Haase <hahj87@gmail.com>
+# Contributor: Joshua Ismael Haase Hernández (xihh) <hahj87@gmail.com>
# Contributor: fauno <fauno@kiwwwi.com.ar>
# Contributor: Márcio Silva <coadde@parabola.nu>
diff --git a/pcr/imagemagick-srv/PKGBUILD b/pcr/imagemagick-nox/PKGBUILD
index 68cd9e607..403e8d84d 100644
--- a/pcr/imagemagick-srv/PKGBUILD
+++ b/pcr/imagemagick-nox/PKGBUILD
@@ -1,26 +1,30 @@
-# $Id$
+# $Id: PKGBUILD 215482 2014-06-26 17:44:45Z eric $
# Maintainer (Arch): Eric Bélanger <eric@archlinux.org>
# Maintainer: Márcio Silva <coadde@parabola.nu>
+# Contributor: Luke Shumaker <lukeshu@sbcglobal.net>
-pkgbase=imagemagick
-pkgname=imagemagick-srv
-pkgver=6.8.8.9
+_pkgname=imagemagick
+pkgname=imagemagick-nox
+pkgver=6.8.9.4
pkgrel=1
arch=('i686' 'x86_64' 'mips64el')
url="http://www.imagemagick.org/"
license=('custom')
-provides=("$pkgbase=$pkgver")
-conflicts=($pkgbase)
-makedepends=('libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'ghostscript' \
- 'openexr' 'libwmf' 'librsvg' 'libxml2' 'jasper' 'liblqr' \
- 'libwebp') # libcl opencl-headers
+# Remove libxt, libxext, opencl-headers, libcl
+makedepends=('libltdl' 'lcms2' 'fontconfig' 'ghostscript'
+ 'openexr' 'libwmf' 'librsvg' 'libxml2' 'liblqr' 'openjpeg2'
+ 'libwebp' 'subversion')
#source=(http://www.imagemagick.org/download/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz{,.asc}
source=(ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz{,.asc}
perlmagick.rpath.patch)
-sha1sums=('3ad2deadbc7e7c6e61eb5590fcc49d71fd96b247'
+sha1sums=('b3aa7b95f8db8a863602fa4c205420ad1d5a69b7'
'SKIP'
'e143cf9d530fabf3b58023899b5cc544ba93daec')
+provides=("$_pkgname=$pkgver")
+conflicts=("$_pkgname")
+replaces=("imagemagick-srv")
+
prepare() {
cd ImageMagick-${pkgver%.*}-${pkgver##*.}
sed '/AC_PATH_XTRA/d' -i configure.ac
@@ -33,30 +37,34 @@ build() {
[[ $CARCH = "i686" ]] && EXTRAOPTS="--with-gcc-arch=i686"
[[ $CARCH = "x86_64" ]] && EXTRAOPTS="--with-gcc-arch=x86-64"
[[ $CARCH = "mips64el" ]] && EXTRAOPTS="--with-gcc-arch=mips64el"
- ./configure --prefix=/usr --sysconfdir=/etc --with-modules --disable-static \
- --disable-hdri --with-wmf --with-openexr --with-xml --with-lcms2 --with-jp2 \
+
+ no_x=yes with_x=no \
+ ./configure --prefix=/usr --sysconfdir=/etc --with-modules \
+ --enable-hdri --with-wmf --with-openexr --with-xml --with-lcms2 \
--with-webp --with-gslib --with-gs-font-dir=/usr/share/fonts/Type1 \
--with-perl --with-perl-options="INSTALLDIRS=vendor" --with-lqr --with-rsvg \
- --disable-opencl --without-gvc --without-djvu --without-autotrace \
+ --disable-opencl --with-openjp2 --without-gvc --without-djvu --without-autotrace \
--without-jbig --without-fpx --without-dps --without-fftw $EXTRAOPTS
make
}
-#check() {
-# cd ImageMagick-${pkgver%.*}-${pkgver##*.}
+check() {
+ cd ImageMagick-${pkgver%.*}-${pkgver##*.}
# make check
-#}
+}
-package_imagemagick-srv() {
- pkgdesc="An image viewing/manipulation program (for web servers)"
- depends=('perl' 'libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'liblqr') # 'libcl')
+package() {
+ pkgdesc="An image viewing/manipulation program"
+ pkgdesc+=" (without X11; for servers)"
+ # Remove libxt, libxext, libcl
+ depends=('perl' 'libltdl' 'lcms2' 'fontconfig' 'liblqr')
optdepends=('imagemagick-doc: for additional information'
- 'ghostscript: for Ghostscript support'
+ 'ghostscript: for Ghostscript support'
'openexr: for OpenEXR support'
+ 'openjpeg2: for JP2 support'
'libwmf: for WMF support'
'librsvg: for SVG support'
'libxml2: for XML support'
- 'jasper: for JPEG-2000 support'
'libpng: for PNG support'
'libwebp: for WEBP support')
backup=("etc/ImageMagick-${pkgver%%.*}/coder.xml"
@@ -76,9 +84,18 @@ package_imagemagick-srv() {
cd ImageMagick-${pkgver%.*}-${pkgver##*.}
make -j1 DESTDIR="${pkgdir}" install
- install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/imagemagick/LICENSE"
- install -Dm644 NOTICE "${pkgdir}/usr/share/licenses/imagemagick/NOTICE"
+ install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+ install -Dm644 NOTICE "${pkgdir}/usr/share/licenses/${pkgname}/NOTICE"
#Cleaning
rm -f "${pkgdir}"/usr/lib/*.la
}
+
+package_imagemagick-doc() {
+ pkgdesc="The ImageMagick documentation (utilities manuals and libraries API)"
+
+ cd ImageMagick-${pkgver%.*}-${pkgver##*.}
+ make DESTDIR="${pkgdir}" install-data-html
+ install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/imagemagick-doc/LICENSE"
+ install -Dm644 NOTICE "${pkgdir}/usr/share/licenses/imagemagick-doc/NOTICE"
+}
diff --git a/pcr/imagemagick-srv/perlmagick.rpath.patch b/pcr/imagemagick-nox/perlmagick.rpath.patch
index a5b1a82e2..a5b1a82e2 100644
--- a/pcr/imagemagick-srv/perlmagick.rpath.patch
+++ b/pcr/imagemagick-nox/perlmagick.rpath.patch
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-07 21:23:57 +0000