Daniel Sabogal: 2 testing/glfw: new aport testing/mupdf: build mupdf-gl and add subpackages 2 files changed, 73 insertions(+), 10 deletions(-)
I've tested this on edge about a week ago. It seems that mupdf has issues with openjpeg 2.2.1 (recently upgraded). I'll submit a new set of patches. On Sun, Aug 21, 2016 at 5:58 PM, Carlo Landmeter <clandmeter@gmail.com> wrote:
Copy & paste the following snippet into your terminal to import this patchset into git:
curl -s https://lists.alpinelinux.org/~alpine/aports/patches/1719/mbox | git am -3Learn more about email & git
http://www.glfw.org/ Multi-platform library for OpenGL and Vulkan application development --- testing/glfw/APKBUILD | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 testing/glfw/APKBUILD diff --git a/testing/glfw/APKBUILD b/testing/glfw/APKBUILD new file mode 100644 index 0000000..5ec631e --- /dev/null +++ b/testing/glfw/APKBUILD @@ -0,0 +1,35 @@ +# Contributor: Daniel Sabogal <dsabogalcc@gmail.com> +# Maintainer: +pkgname=glfw +pkgver=3.2 +pkgrel=0 +pkgdesc="Multi-platform library for OpenGL and Vulkan application development" +url="http://www.glfw.org/" +arch="all" +license="zlib" +depends="" +depends_dev="libxinerama-dev linux-headers mesa-dev" +makedepends="$depends_dev cmake libx11-dev libxcursor-dev libxrandr-dev" +subpackages="$pkgname-dev" +source="$pkgname-$pkgver.tar.gz::https://github.com/glfw/$pkgname/archive/$pkgver.tar.gz" + +builddir="$srcdir/$pkgname-$pkgver" + +build() { + cd "$builddir" + cmake . \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DBUILD_SHARED_LIBS=ON \ + || return 1 + make || return 1 +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir/" install || return 1 +} + +md5sums="a4a7248d771717a84c8997b7b712cd57 glfw-3.2.tar.gz" +sha256sums="cb3aab46757981a39ae108e5207a1ecc4378e68949433a2b040ce2e17d8f6aa6 glfw-3.2.tar.gz" +sha512sums="55982cba8b6605fe5489f7396fb5101f3eedd121d13a51ab8178e4bd2c8b348a8b7869fcd00dbefe5725b5c04942318c2a99f13832da4bfa74db42ab2812f3a2 glfw-3.2.tar.gz" -- 2.8.3 --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---
Fixes #5921 build mupdf with OpenGL backend split mupdf-x11, mupdf-gl, and mupdf-tools into subpackages
Carlo Landmeter <clandmeter@gmail.com>This fails to build for me on edge, are you using recent edge with gcc6 to build this? LINK build/release/libmupdf.so.0 build/release/fitz/load-jpx.o: In function `fz_load_jpx': load-jpx.c:(.text+0x154): undefined reference to `opj_set_default_decoder_parameters' load-jpx.c:(.text+0x167): undefined reference to `opj_create_decompress' load-jpx.c:(.text+0x181): undefined reference to `opj_set_info_handler' load-jpx.c:(.text+0x193): undefined reference to `opj_set_warning_handler' load-jpx.c:(.text+0x1a5): undefined reference to `opj_set_error_handler' load-jpx.c:(.text+0x1b2): undefined reference to `opj_setup_decoder' load-jpx.c:(.text+0x1c4): undefined reference to `opj_stream_default_create' load-jpx.c:(.text+0x1e8): undefined reference to `opj_stream_set_read_function' load-jpx.c:(.text+0x1f7): undefined reference to `opj_stream_set_skip_function' load-jpx.c:(.text+0x206): undefined reference to `opj_stream_set_seek_function' load-jpx.c:(.text+0x215): undefined reference to `opj_stream_set_user_data' load-jpx.c:(.text+0x220): undefined reference to `opj_stream_set_user_data_length' load-jpx.c:(.text+0x230): undefined reference to `opj_read_header' load-jpx.c:(.text+0x248): undefined reference to `opj_decode' load-jpx.c:(.text+0x258): undefined reference to `opj_stream_destroy' load-jpx.c:(.text+0x260): undefined reference to `opj_destroy_codec' load-jpx.c:(.text+0x535): undefined reference to `opj_image_destroy' load-jpx.c:(.text+0x663): undefined reference to `opj_image_destroy' load-jpx.c:(.text+0x67b): undefined reference to `opj_image_destroy' load-jpx.c:(.text+0x698): undefined reference to `opj_image_destroy' load-jpx.c:(.text+0x6b5): undefined reference to `opj_image_destroy' build/release/fitz/load-jpx.o:load-jpx.c:(.text+0x6d2): more undefined references to `opj_image_destroy' follow build/release/fitz/load-jpx.o: In function `fz_load_jpx': load-jpx.c:(.text+0x6f2): undefined reference to `opj_stream_destroy' load-jpx.c:(.text+0x6fa): undefined reference to `opj_destroy_codec' load-jpx.c:(.text+0x717): undefined reference to `opj_stream_destroy' load-jpx.c:(.text+0x71f): undefined reference to `opj_destroy_codec' load-jpx.c:(.text+0x729): undefined reference to `opj_image_destroy' load-jpx.c:(.text+0x783): undefined reference to `opj_destroy_codec' /usr/lib/gcc/x86_64-alpine-linux-musl/6.1.1/../../../../x86_64-alpine-linux-musl/bin/ld: build/release/libmupdf.so.0: hidden symbol `opj_stream_set_user_data' isn't defined /usr/lib/gcc/x86_64-alpine-linux-musl/6.1.1/../../../../x86_64-alpine-linux-musl/bin/ld: final link failed: Bad value collect2: error: ld returned 1 exit status
--- 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 <zhoumichaely@gmail.com> 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 ---