X-Original-To: alpine-aports@lists.alpinelinux.org Received: from mail-oi0-f68.google.com (mail-oi0-f68.google.com [209.85.218.68]) by lists.alpinelinux.org (Postfix) with ESMTP id 21C085C47DA for ; Fri, 19 Aug 2016 15:59:20 +0000 (GMT) Received: by mail-oi0-f68.google.com with SMTP id e80so6474679oig.2 for ; Fri, 19 Aug 2016 08:59:20 -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=+p6FHuaPBmvhVov4shNRgpULPMeNS+l5jdx2I5QSLbs=; b=Qevu6EayciGaDK0Rrg3qCOgkbF4kg278LCs9FZwoICV3Hanlk+YYtDshXIEYLtOfRt QbdUO788izzXs+8U+aUV+TfBIhrTKh3X33w0EHEUrIt866LhF/vsYrdkf6T9EARRV1pZ YKWbCll9May06S+3PNLvcqAddiDUg4tD6Lj/ZE44VpP36kJ/1hH3vNnoYLpjYYa7Chsw EaC55SN5CatkSIfdmyO666QyZO4pp69AN0dXE698WSm9d08psj22bsPlD21RJRb6Ifnh 0gt99g9UUvz9aMFnXiaO54miXtfakeKpf6lq27vtwOkftTRk5vuCONG5t3DvgTziCFU/ mImw== 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=+p6FHuaPBmvhVov4shNRgpULPMeNS+l5jdx2I5QSLbs=; b=bCnkeJi/hFTLidSrh+LdI2Bzyq5gjG0CxJAWMemHDY9bJJ9ezqrzghrILnPGpVrigM dY1wfYb+jb9sv3i3doxWaK0pBmjs6MgNq2ZkhlTVFgqhRQ/Ev0KTNPyPOANYLX4XEAA4 8Xf1AskKUhez3VH5HgLTmrleS60k/XQIAzjVt8Zo9fbG+GNYwtsosRwPHYTsq0eU1kbI AtbQVhi8VfeN8ek2Wh5REDFwWBa0O3Aqv6v0wyLzsGDrGlh24GkP6yWE+Re27qv/H3Hi SP/CfZcrf+2gwU3Ho1SVgzYhMkODgCCyro9Hu1NVNeYm020/SohveGAcA4LiYclu+GDL p0gQ== X-Gm-Message-State: AEkoouu1jvyAf+dNB0V3CV32nEUWQ83c2bW/yRa293Q0vEZ/zJ/QVJujMEsvnMVuv9bAFg== X-Received: by 10.157.39.103 with SMTP id r94mr5594954ota.64.1471622359832; Fri, 19 Aug 2016 08:59:19 -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 c44sm4094869ote.14.2016.08.19.08.59.19 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 19 Aug 2016 08:59:19 -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: Fri, 19 Aug 2016 11:58:39 -0400 Message-Id: <20160819155839.19019-2-dsabogalcc@gmail.com> X-Mailer: git-send-email 2.8.3 In-Reply-To: <20160819155839.19019-1-dsabogalcc@gmail.com> References: <20160819155839.19019-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 92fee92..9c1f3f5 100644 --- a/testing/mupdf/APKBUILD +++ b/testing/mupdf/APKBUILD @@ -2,22 +2,22 @@ # Maintainer: Michael Zhou pkgname=mupdf pkgver=1.9a -pkgrel=1 +pkgrel=2 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 mupdf-openjpeg-2.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 ---