diff options
| -rw-r--r-- | libraries/jbig2enc/jbig2enc.SlackBuild | 16 | ||||
| -rw-r--r-- | libraries/jbig2enc/jbig2enc.info | 6 | ||||
| -rw-r--r-- | libraries/jbig2enc/leptonica_api_fix.diff | 37 |
3 files changed, 10 insertions, 49 deletions
diff --git a/libraries/jbig2enc/jbig2enc.SlackBuild b/libraries/jbig2enc/jbig2enc.SlackBuild index 2ca4e2ecd3580..eed23afbefa2b 100644 --- a/libraries/jbig2enc/jbig2enc.SlackBuild +++ b/libraries/jbig2enc/jbig2enc.SlackBuild @@ -7,7 +7,7 @@ # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details. PRGNAM=jbig2enc -VERSION=${VERSION:-0.28} +VERSION=${VERSION:-0.29} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -40,7 +40,10 @@ fi set -e -TARNAM=$PRGNAM-$VERSION-dist +# used to be, for 0.28-dist: +#TARNAM=$PRGNAM-$VERSION-dist + +TARNAM=$PRGNAM-$VERSION rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT @@ -55,12 +58,6 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -# taken from upstream git, fix compile with leptonica >= 1.70 (we -# have 1.73). commit here: -# https://github.com/agl/jbig2enc/commit/53ce5fe7e73d7ed95c9e12b52dd4984723f865fa -patch -p1 < $CWD/leptonica_api_fix.diff - -# have to do this, configure.ac was patched above. autoreconf -if CFLAGS="$SLKCFLAGS" \ @@ -88,7 +85,8 @@ for i in $MANPAGES; do gzip -9c < $CWD/$i.1 > $PKG/usr/man/man1/$i.1.gz done -# docs already installed. +# docs already installed, except this one: +cp -a fcd14492.pdf $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/libraries/jbig2enc/jbig2enc.info b/libraries/jbig2enc/jbig2enc.info index dd83f20b91adc..ef43beb47c813 100644 --- a/libraries/jbig2enc/jbig2enc.info +++ b/libraries/jbig2enc/jbig2enc.info @@ -1,8 +1,8 @@ PRGNAM="jbig2enc" -VERSION="0.28" +VERSION="0.29" HOMEPAGE="https://github.com/agl/jbig2enc" -DOWNLOAD="https://github.com/agl/jbig2enc/archive/0.28-dist/jbig2enc-0.28-dist.tar.gz" -MD5SUM="34a22be7dedc77d22c8e3f43224e38a7" +DOWNLOAD="https://github.com/agl/jbig2enc/archive/0.29/jbig2enc-0.29.tar.gz" +MD5SUM="c3d1f7fd51e272301d5de436afb1fccb" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="leptonica" diff --git a/libraries/jbig2enc/leptonica_api_fix.diff b/libraries/jbig2enc/leptonica_api_fix.diff deleted file mode 100644 index ff36809052dca..0000000000000 --- a/libraries/jbig2enc/leptonica_api_fix.diff +++ /dev/null @@ -1,37 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index fe37c22..753a607 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -55,6 +55,7 @@ AC_CHECK_LIB([lept], [findFileFormatStream], [], [ - echo "Error! Leptonica not detected." - exit -1 - ]) -+AC_CHECK_FUNCS(expandBinaryPower2Low,,) - # test for function - it should detect leptonica dependecies - - # Check for possible dependancies of leptonica. -diff --git a/src/jbig2.cc b/src/jbig2.cc -index e10f042..515c1ef 100644 ---- a/src/jbig2.cc -+++ b/src/jbig2.cc -@@ -130,11 +130,16 @@ segment_image(PIX *pixb, PIX *piximg) { - // input color image, so we have to do it this way... - // is there a better way? - // PIX *pixd = pixExpandBinary(pixd4, 4); -- PIX *pixd = pixCreate(piximg->w, piximg->h, 1); -- pixCopyResolution(pixd, piximg); -- if (verbose) pixInfo(pixd, "mask image: "); -- expandBinaryPower2Low(pixd->data, pixd->w, pixd->h, pixd->wpl, -+ PIX *pixd; -+#ifdef HAVE_EXPANDBINARYPOWER2LOW -+ pixd = pixCreate(piximg->w, piximg->h, 1); -+ pixCopyResolution(pixd, piximg); -+ expandBinaryPower2Low(pixd->data, pixd->w, pixd->h, pixd->wpl, - pixd4->data, pixd4->w, pixd4->h, pixd4->wpl, 4); -+#else -+ pixd = pixExpandBinaryPower2(pixd4, 4); -+#endif -+ if (verbose) pixInfo(pixd, "mask image: "); - - pixDestroy(&pixd4); - pixDestroy(&pixsf4); |