From: bra1nwave <bra1nwave@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] [WIP] calibre
Date: Fri, 10 Apr 2020 14:06:13 +0200 [thread overview]
Message-ID: <20200410120613.kjmrrHl-uIj82gKWCtvT8e-qTVuKVAC1b9QOH8_sJms@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-20793@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 307 bytes --]
There is an updated pull request by bra1nwave against master on the void-packages repository
https://github.com/bra1nwave/void-packages calibre
https://github.com/void-linux/void-packages/pull/20793
[WIP] calibre
A patch file from https://github.com/void-linux/void-packages/pull/20793.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-calibre-20793.patch --]
[-- Type: text/x-diff, Size: 8435 bytes --]
From b30f91c648ab5a27035b93a05338a06760643c3c Mon Sep 17 00:00:00 2001
From: bra1nwave <bra1nwave@protonmail.com>
Date: Fri, 10 Apr 2020 08:16:22 +0200
Subject: [PATCH 1/2] WIP
---
srcpkgs/calibre/template | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template
index f9ae0a5923b..f49f85176ed 100644
--- a/srcpkgs/calibre/template
+++ b/srcpkgs/calibre/template
@@ -1,7 +1,7 @@
# Template file for 'calibre'
pkgname=calibre
version=4.13.0
-revision=3
+revision=4
build_style=python2-module
pycompile_dirs="/usr/lib/calibre/"
hostmakedepends="pkg-config python-BeautifulSoup4 python-Pillow python-PyQt5-svg
@@ -18,6 +18,7 @@ depends="desktop-file-utils optipng poppler-utils python-BeautifulSoup4
python-dnspython python-feedparser python-html5-parser python-mechanize
python-msgpack python-netifaces python-psutil python-regex python-html2text
qt5-webengine"
+checkdepends="$depends libjpeg-turbo-tools jxrlib"
short_desc="Ebook management application"
maintainer="bra1nwave <bra1nwave@protonmail.com>"
license="GPL-3.0-only"
@@ -44,9 +45,11 @@ do_build() {
python2 setup.py rapydscript
}
-# requires an X11 environment...
do_check() {
- :
+ # The qt test crashes without any error messages
+ # disabled for now
+ python2 setup.py test \
+ --exclude-test-name qt
}
do_install() {
From 39cd6eef674554a329a53901c79f487058fe6be8 Mon Sep 17 00:00:00 2001
From: bra1nwave <bra1nwave@protonmail.com>
Date: Fri, 10 Apr 2020 13:43:37 +0200
Subject: [PATCH 2/2] New package: jxrlib-0.2.2
---
common/shlibs | 2 +
srcpkgs/jxrlib-devel | 1 +
srcpkgs/jxrlib/patches/usecmake.patch | 143 ++++++++++++++++++++++++++
srcpkgs/jxrlib/template | 20 ++++
4 files changed, 166 insertions(+)
create mode 120000 srcpkgs/jxrlib-devel
create mode 100644 srcpkgs/jxrlib/patches/usecmake.patch
create mode 100644 srcpkgs/jxrlib/template
diff --git a/common/shlibs b/common/shlibs
index 552a4d04e78..4d74be546a7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3857,3 +3857,5 @@ libbudgietheme.so.0 budgie-desktop-10.5.1_1
libbudgie-plugin.so.0 budgie-desktop-10.5.1_1
libslirp.so.0 libslirp-4.2.0_1
libqpdf.so.28 libqpdf-10.0.0_1
+libjpegxr.so.0 jxrlib-0.2.2_1
+libjxrglue.so.0 jxrlib-0.2.2_1
diff --git a/srcpkgs/jxrlib-devel b/srcpkgs/jxrlib-devel
new file mode 120000
index 00000000000..1f1ea142a5f
--- /dev/null
+++ b/srcpkgs/jxrlib-devel
@@ -0,0 +1 @@
+jxrlib/
\ No newline at end of file
diff --git a/srcpkgs/jxrlib/patches/usecmake.patch b/srcpkgs/jxrlib/patches/usecmake.patch
new file mode 100644
index 00000000000..ef2e7de79b5
--- /dev/null
+++ b/srcpkgs/jxrlib/patches/usecmake.patch
@@ -0,0 +1,143 @@
+Description: Prefer a cmake based build system
+Author: Mathieu Malaterre <malat@debian.org>
+Forwarded: https://jxrlib.codeplex.com/discussions/440294
+
+Index: jxrlib-1.1/CMakeLists.txt
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ CMakeLists.txt 2014-03-26 17:05:04.429637801 +0100
+@@ -0,0 +1,134 @@
++# Copyright Mathieu Malaterre <malat@debian.org>
++# BSD (Same as jxrlib)
++cmake_minimum_required(VERSION 2.8)
++project(jxrlib C)
++
++# Need shared libs for ABI
++set(BUILD_SHARED_LIBS ON)
++
++# helper macro to preserve original Makefile convention
++macro(JXR_MAKE_OBJ SET_NAME)
++ foreach(src ${SRC_${SET_NAME}})
++ list(APPEND OBJ_${SET_NAME} ${DIR_${SET_NAME}}/${src})
++ endforeach()
++endmacro()
++
++include(TestBigEndian)
++test_big_endian(ISBIGENDIAN)
++if(ISBIGENDIAN)
++ set(DEF_ENDIAN _BIG__ENDIAN_)
++endif()
++
++set(DIR_SYS image/sys)
++set(DIR_DEC image/decode)
++set(DIR_ENC image/encode)
++
++set(DIR_GLUE jxrgluelib)
++set(DIR_TEST jxrtestlib)
++set(DIR_EXEC jxrencoderdecoder)
++
++if(NOT JXRLIB_INSTALL_BIN_DIR)
++ set(JXRLIB_INSTALL_BIN_DIR "bin")
++endif()
++
++if(NOT JXRLIB_INSTALL_LIB_DIR)
++ set(JXRLIB_INSTALL_LIB_DIR "lib")
++endif()
++
++if(NOT JXRLIB_INSTALL_INCLUDE_DIR)
++ set(JXRLIB_INSTALL_INCLUDE_DIR "include/jxrlib")
++endif()
++
++include_directories(
++ common/include
++ ${DIR_SYS}
++ ${DIR_GLUE}
++ ${DIR_TEST}
++)
++
++# where is strlcpy ?
++include(CheckSymbolExists)
++check_symbol_exists(strlcpy "string.h" HAVE_STRLCPY)
++#set(CMAKE_REQUIRED_LIBRARIES bsd)
++#CHECK_SYMBOL_EXISTS(strlcpy "string.h" HAVE_STRLCPY4)
++# on linux, strlcpy is in -lbsd:
++#if(NOT HAVE_STRLCPY)
++# include(CheckLibraryExists)
++# find_library(BSD_LIBRARY bsd)
++# check_library_exists(bsd "strlcpy" ${BSD_LIBRARY} HAVE_STRLCPY_BSD)
++#endif()
++
++# JPEG-XR
++set(SRC_SYS adapthuff.c image.c strcodec.c strPredQuant.c strTransform.c perfTimerANSI.c)
++JXR_MAKE_OBJ(SYS)
++set(SRC_DEC decode.c postprocess.c segdec.c strdec.c strInvTransform.c strPredQuantDec.c JXRTranscode.c)
++JXR_MAKE_OBJ(DEC)
++set(SRC_ENC encode.c segenc.c strenc.c strFwdTransform.c strPredQuantEnc.c)
++JXR_MAKE_OBJ(ENC)
++
++add_library(jpegxr ${OBJ_ENC} ${OBJ_DEC} ${OBJ_SYS})
++set_property(TARGET jpegxr
++ PROPERTY COMPILE_DEFINITIONS __ANSI__ DISABLE_PERF_MEASUREMENT ${DEF_ENDIAN}
++)
++set_property(TARGET jpegxr PROPERTY LINK_INTERFACE_LIBRARIES "")
++set_property(TARGET jpegxr PROPERTY COMPILE_FLAGS -w)
++# VERSION/SOVERSION
++set_property(TARGET jpegxr PROPERTY VERSION 1.1)
++set_property(TARGET jpegxr PROPERTY SOVERSION 0)
++install(TARGETS jpegxr
++ EXPORT JXRLibTargets
++ RUNTIME DESTINATION ${JXRLIB_INSTALL_BIN_DIR} COMPONENT Applications
++ LIBRARY DESTINATION ${JXRLIB_INSTALL_LIB_DIR} COMPONENT Libraries
++)
++
++# JXR-GLUE
++set(SRC_GLUE JXRGlue.c JXRMeta.c JXRGluePFC.c JXRGlueJxr.c)
++JXR_MAKE_OBJ(GLUE)
++set(SRC_TEST JXRTest.c JXRTestBmp.c JXRTestHdr.c JXRTestPnm.c JXRTestTif.c JXRTestYUV.c)
++JXR_MAKE_OBJ(TEST)
++
++add_library(jxrglue ${OBJ_GLUE} ${OBJ_TEST})
++set_property(TARGET jxrglue
++ PROPERTY COMPILE_DEFINITIONS __ANSI__ DISABLE_PERF_MEASUREMENT ${DEF_ENDIAN}
++)
++set_property(TARGET jxrglue PROPERTY LINK_INTERFACE_LIBRARIES "")
++set_property(TARGET jxrglue PROPERTY COMPILE_FLAGS -w)
++# VERSION/SOVERSION
++set_property(TARGET jxrglue PROPERTY VERSION 1.1)
++set_property(TARGET jxrglue PROPERTY SOVERSION 0)
++install(TARGETS jxrglue
++ EXPORT JXRLibTargets
++ RUNTIME DESTINATION ${JXRLIB_INSTALL_BIN_DIR} COMPONENT Applications
++ LIBRARY DESTINATION ${JXRLIB_INSTALL_LIB_DIR} COMPONENT Libraries
++)
++#if(HAVE_STRLCPY_BSD)
++# target_link_libraries(jxrglue ${BSD_LIBRARY})
++#endif()
++target_link_libraries(jxrglue jpegxr m)
++# Enc app files
++set(ENCAPP JxrEncApp)
++add_executable(${ENCAPP} ${DIR_EXEC}/${ENCAPP}.c)
++set_property(TARGET ${ENCAPP}
++ PROPERTY COMPILE_DEFINITIONS __ANSI__ DISABLE_PERF_MEASUREMENT ${DEF_ENDIAN}
++)
++set_property(TARGET ${ENCAPP} PROPERTY COMPILE_FLAGS -w)
++target_link_libraries(${ENCAPP} jxrglue) # jpegxr)
++install(TARGETS ${ENCAPP} RUNTIME DESTINATION ${JXRLIB_INSTALL_BIN_DIR})
++# Dec app files
++set(DECAPP JxrDecApp)
++add_executable(${DECAPP} ${DIR_EXEC}/${DECAPP}.c)
++set_property(TARGET ${DECAPP}
++ PROPERTY COMPILE_DEFINITIONS __ANSI__ DISABLE_PERF_MEASUREMENT ${DEF_ENDIAN}
++)
++set_property(TARGET ${DECAPP} PROPERTY COMPILE_FLAGS -w)
++target_link_libraries(${DECAPP} jxrglue) # jpegxr)
++install(TARGETS ${DECAPP} RUNTIME DESTINATION ${JXRLIB_INSTALL_BIN_DIR})
++
++# install rules
++install(FILES jxrgluelib/JXRGlue.h jxrgluelib/JXRMeta.h jxrtestlib/JXRTest.h
++ image/sys/windowsmediaphoto.h
++ DESTINATION ${JXRLIB_INSTALL_INCLUDE_DIR} COMPONENT Headers
++)
++install(DIRECTORY common/include/ DESTINATION ${JXRLIB_INSTALL_INCLUDE_DIR}
++ FILES_MATCHING PATTERN "*.h"
++)
diff --git a/srcpkgs/jxrlib/template b/srcpkgs/jxrlib/template
new file mode 100644
index 00000000000..48f02dceab6
--- /dev/null
+++ b/srcpkgs/jxrlib/template
@@ -0,0 +1,20 @@
+# Template file for 'jxrlib'
+pkgname=jxrlib
+version=0.2.2
+revision=1
+build_style=cmake
+short_desc="Open source implementation of jpegxr"
+maintainer="bra1nwave <bra1nwave@protonmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/glencoesoftware/jxrlib"
+distfiles="${homepage}/archive/v${version}.tar.gz"
+checksum=d1fbc5759a665949e7cb82de03c3258788bd07323f195a9e8ea9322504627cc3
+
+jxrlib-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision}"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.so"
+ }
+}
next prev parent reply other threads:[~2020-04-10 12:06 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-09 14:59 [PR PATCH] " bra1nwave
2020-04-09 15:50 ` [PR PATCH] [Updated] " bra1nwave
2020-04-09 23:10 ` q66
2020-04-10 12:06 ` bra1nwave [this message]
2020-04-10 12:06 ` bra1nwave
2020-04-12 8:35 ` bra1nwave
2020-04-24 19:24 ` [PR PATCH] [Updated] " bra1nwave
2020-04-24 19:27 ` calibre: update to 4.14.0 bra1nwave
2020-04-29 15:33 ` [PR PATCH] [Updated] " bra1nwave
2020-05-01 23:46 ` [PR PATCH] [Closed]: " Piraty
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200410120613.kjmrrHl-uIj82gKWCtvT8e-qTVuKVAC1b9QOH8_sJms@z \
--to=bra1nwave@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).