X-Original-To: alpine-aports@lists.alpinelinux.org Received: from mail-oi0-f65.google.com (mail-oi0-f65.google.com [209.85.218.65]) by lists.alpinelinux.org (Postfix) with ESMTP id 1918B5C47FB for ; Mon, 22 Aug 2016 03:23:34 +0000 (GMT) Received: by mail-oi0-f65.google.com with SMTP id b22so10679687oii.3 for ; Sun, 21 Aug 2016 20:23:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id:in-reply-to:references; bh=GKNh9QXQBZAPESHIzJ7y9UEJsqiLeYAx6mddJsSUq1c=; b=nYeWyTdrINWm70pLbavzDnnTLeWnVTl9cHLA2Y0Ahz3Ooic8zj7HK4BRqN36QVVKjB sRZv2X8BHzaZD0SGFtBaT6JZ5U1qIY4OTi9IOD5ojmpvxgGn1ZhyxHBUDPOW8qPcgz+/ q2xs6znjH3D7Cay+mXdANbM95o6ZjJonr1b+ztd7kE0bnh/uq0fCUxZuno3lFujau2Ra 2Qdcnn7tIL91L2X12XvHTkkRZuzSeFYdzjskI4eL4DPBDYEOXh7NFTZeMzYFTa1RoVVy 8me/mGSZHg91GvD68mwiFuUMnSX8RFdVTuhEk2iY8gU9S+rX1puZtko+CIERDj+7gq9B 2/mQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=GKNh9QXQBZAPESHIzJ7y9UEJsqiLeYAx6mddJsSUq1c=; b=iDrpWpPliETIVSREGq7i2ocw3/oM9pv7FlWWMWEW9geSd4pWr3wi/1hViUIl25kmFY mDUWaElqdwowLIhE2Nq67m3mEQx+ssjqOj2QV4OFLm942xQo83qwKMBS+CP/4Ib7lOIZ Rnox7H3JN4DS6LldZEu1Xg6rBH6CNIu4YxFLlPSFyRVbo7V7n0Y2A1l2vm6nRLIJXhSi lUZWRXzLIOrPrx2w6bVr8gRz4UDRkmo8TlxqtxE+SagOLnwyqaTEHNUK3AL8Ote2EznZ o1ysQyw4oyXoZ2xRfIHxsBiHv7GK5GFNiI6rWOm9wZImX8GhyR0FOnAKYDJvQsoL8rJl qDhA== X-Gm-Message-State: AEkoous14AAGTbilJ9vOGFfKBWY1YO2HTW7OcZvRdgBKdmFKIfJ7DhO/nxBNYzMrqjx1Pw== X-Received: by 10.202.172.14 with SMTP id v14mr11699396oie.121.1471836213764; Sun, 21 Aug 2016 20:23:33 -0700 (PDT) Received: from alp.my.domain (ip72-196-114-247.ga.at.cox.net. [72.196.114.247]) by smtp.gmail.com with ESMTPSA id s132sm10790186oif.3.2016.08.21.20.23.33 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 21 Aug 2016 20:23:33 -0700 (PDT) From: Daniel Sabogal To: alpine-aports@lists.alpinelinux.org Subject: [alpine-aports] [PATCH 2/2] testing/mupdf: build mupdf-gl and add subpackages Date: Sun, 21 Aug 2016 23:23:21 -0400 Message-Id: <20160822032321.14976-2-dsabogalcc@gmail.com> X-Mailer: git-send-email 2.8.3 In-Reply-To: <20160822032321.14976-1-dsabogalcc@gmail.com> References: <20160822032321.14976-1-dsabogalcc@gmail.com> X-Mailinglist: alpine-aports Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: fixes #5921 build mupdf with OpenGL backend split mupdf-x11, mupdf-gl, and mupdf-tools into subpackages --- testing/mupdf/APKBUILD | 48 ++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 38 insertions(+), 10 deletions(-) diff --git a/testing/mupdf/APKBUILD b/testing/mupdf/APKBUILD index a3f0b40..7b554aa 100644 --- a/testing/mupdf/APKBUILD +++ b/testing/mupdf/APKBUILD @@ -2,22 +2,22 @@ # Maintainer: Michael Zhou pkgname=mupdf pkgver=1.9a -pkgrel=2 +pkgrel=3 pkgdesc="A lightweight PDF and XPS viewer" url="http://mupdf.com" arch="all" license="AGPL3+" depends="" makedepends="freetype-dev jpeg-dev jbig2dec-dev libx11-dev libxext-dev - openjpeg-dev harfbuzz-dev" -install="" -subpackages="$pkgname-doc $pkgname-dev" + openjpeg-dev harfbuzz-dev glfw-dev" +subpackages="$pkgname-doc $pkgname-dev $pkgname-x11:_x11 + $pkgname-gl:_gl $pkgname-tools:_tools" source="http://mupdf.com/downloads/archive/$pkgname-$pkgver-source.tar.gz shared-lib.patch openjpeg-2.1.1.patch " -builddir="$srcdir/$pkgname-${pkgver}-source" +builddir="$srcdir/$pkgname-$pkgver-source" prepare() { default_prepare || return 1 @@ -31,16 +31,44 @@ prepare() { } build() { - cd "$builddir" - make prefix=/usr || return 1 + make HAVE_GLFW=yes SYS_GLFW_LIBS="-lglfw -lGL" \ + prefix=/usr -C "$builddir" || return 1 } package() { - cd "$builddir" - make prefix=/usr DESTDIR="$pkgdir" install || return 1 + make HAVE_GLFW=yes \ + prefix=/usr DESTDIR="$pkgdir" \ + -C "$builddir" install || return 1 + ln -s libmupdf.so.0 "$pkgdir"/usr/lib/libmupdf.so ln -s libmupdfthird.so.0 "$pkgdir"/usr/lib/libmupdfthird.so - ln -s /usr/bin/$pkgname-x11 "$pkgdir"/usr/bin/$pkgname +} + +_x11() { + pkgdesc="A lightweight PDF and XPS viewer with X11 backend" + depends="!mupdf-gl mupdf" + mkdir -p "$subpkgdir"/usr/bin + mv "$pkgdir"/usr/bin/mupdf-x11 \ + "$subpkgdir"/usr/bin/ || return 1 + ln -s /usr/bin/mupdf-x11 "$subpkgdir"/usr/bin/mupdf +} + +_gl() { + pkgdesc="A lightweight PDF and XPS viewer with OpenGL backend" + depends="!mupdf-x11 mupdf" + mkdir -p "$subpkgdir"/usr/bin + mv "$pkgdir"/usr/bin/mupdf-gl \ + "$subpkgdir"/usr/bin/ || return 1 + ln -s /usr/bin/mupdf-gl "$subpkgdir"/usr/bin/mupdf +} + +_tools() { + pkgdesc="Tools for a lightweight PDF and XPS viewer" + depends="mupdf" + mkdir -p "$subpkgdir"/usr/bin + mv "$pkgdir"/usr/bin/mutool \ + "$pkgdir"/usr/bin/mujstest \ + "$subpkgdir"/usr/bin/ || return 1 } md5sums="658b90788a57d858dcb069cf326e11c3 mupdf-1.9a-source.tar.gz -- 2.8.3 --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---