Date: Wed, 9 Jun 2021 08:21:57 GMT From: =?utf-8?Q?Fernando Apestegu=C3=ADa=?= <fernape@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 46a560897d7c - main - graphics/libbpg: update to 0.9.8 Message-ID: <202106090821.1598Lv12017285@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=46a560897d7c17a9dcd0aa0bd16633d5a286a5fc commit 46a560897d7c17a9dcd0aa0bd16633d5a286a5fc Author: Fernando ApesteguĂa <fernape@FreeBSD.org> AuthorDate: 2021-06-09 07:13:12 +0000 Commit: Fernando ApesteguĂa <fernape@FreeBSD.org> CommitDate: 2021-06-09 08:18:07 +0000 graphics/libbpg: update to 0.9.8 ChangeLog: https://github.com/mirrorer/libbpg/blob/master/ChangeLog * Add library SONAME * Fix JVTCHI option PR: 256243 Reported by: mazhe@alkumuna.eu (maintainer) --- graphics/libbpg/Makefile | 17 +++++++++++------ graphics/libbpg/distinfo | 6 +++--- graphics/libbpg/files/patch-Makefile | 30 ++++++++++++++++-------------- graphics/libbpg/pkg-plist | 2 ++ 4 files changed, 32 insertions(+), 23 deletions(-) diff --git a/graphics/libbpg/Makefile b/graphics/libbpg/Makefile index 57e7c2d8c7a2..45d106d49fc9 100644 --- a/graphics/libbpg/Makefile +++ b/graphics/libbpg/Makefile @@ -1,8 +1,7 @@ # Created by: Matthieu Volat <mazhe@alkumuna.eu> PORTNAME= libbpg -PORTVERSION= 0.9.7 -PORTREVISION= 11 +PORTVERSION= 0.9.8 CATEGORIES= graphics MASTER_SITES= http://bellard.org/bpg/ @@ -17,15 +16,16 @@ LIB_DEPENDS= libpng.so:graphics/png USES= compiler:c++11-lib gmake jpeg localbase:ldflags USE_LDCONFIG= yes -CFLAGS+= -fPIC MAKE_ARGS+= X265_LIBS=${X265_LIBS} +CFLAGS+= -fPIC -OPTIONS_DEFINE= SDL JCTVC X265 +OPTIONS_DEFINE= SDL JCTVC JCTVCHI X265 OPTIONS_DEFAULT=SDL X265 OPTIONS_SUB= yes JCTVC_DESC= Enable JCTVC (best quality but slow) for the encoder -JCTVCHI_DESC= Use bit depths > 12 with JCTVC (experimental) +JCTVCHI_DESC= Use bit depths > 12 with JCTVC (experimental, need JCTVC) +JCTVCHI_IMPLIES= JCTVC SDL_USES= sdl SDL_USE= SDL=image @@ -36,6 +36,9 @@ X265_VARS= x265_libs=${PREFIX}/lib/libx265.so do-configure-JCTVC-off: ${REINPLACE_CMD} -e 's/^USE_JCTVC=y$$/#USE_JCTVC=/' ${WRKSRC}/Makefile +do-configure-JCTVCHI-on: + ${REINPLACE_CMD} -e 's/^#USE_JCTVC_HIGH_BIT_DEPTH=y$$/USE_JCTVC_HIGH_BIT_DEPTH=y/' ${WRKSRC}/Makefile + do-configure-SDL-off: ${REINPLACE_CMD} -e 's/^USE_BPGVIEW=y$$/#USE_BPGVIEW=/' ${WRKSRC}/Makefile @@ -45,7 +48,9 @@ do-configure-X265-off: post-install: ${INSTALL_DATA} ${WRKSRC}/libbpg.h ${STAGEDIR}${PREFIX}/include ${INSTALL_DATA} ${WRKSRC}/libbpg.a ${STAGEDIR}${PREFIX}/lib - ${INSTALL_LIB} ${WRKSRC}/libbpg.so ${STAGEDIR}${PREFIX}/lib + ${INSTALL_LIB} ${WRKSRC}/libbpg.so ${STAGEDIR}${PREFIX}/lib/libbpg.so.${DISTVERSION:R} + ${LN} -sf libbpg.so.${DISTVERSION:R} ${STAGEDIR}${PREFIX}/lib/libbpg.so.${DISTVERSION:R:R} + ${LN} -sf libbpg.so.${DISTVERSION:R:R} ${STAGEDIR}${PREFIX}/lib/libbpg.so post-install-SDL-on: ${INSTALL_PROGRAM} ${WRKSRC}/bpgview ${STAGEDIR}${PREFIX}/bin diff --git a/graphics/libbpg/distinfo b/graphics/libbpg/distinfo index 1b324b532dc4..e44b3b4e69ad 100644 --- a/graphics/libbpg/distinfo +++ b/graphics/libbpg/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1463397263 -SHA256 (libbpg-0.9.7.tar.gz) = 05035862ff4ffca0280261871486f44e74c4af4337c931e0858483551e6efe25 -SIZE (libbpg-0.9.7.tar.gz) = 2028932 +TIMESTAMP = 1622264337 +SHA256 (libbpg-0.9.8.tar.gz) = c0788e23bdf1a7d36cb4424ccb2fae4c7789ac94949563c4ad0e2569d3bf0095 +SIZE (libbpg-0.9.8.tar.gz) = 2029021 diff --git a/graphics/libbpg/files/patch-Makefile b/graphics/libbpg/files/patch-Makefile index 73cdbcb44001..055d63bf293a 100644 --- a/graphics/libbpg/files/patch-Makefile +++ b/graphics/libbpg/files/patch-Makefile @@ -1,4 +1,4 @@ ---- Makefile.orig 2016-05-15 09:06:19 UTC +--- Makefile.orig 2018-04-21 09:42:55 UTC +++ Makefile @@ -17,7 +17,7 @@ USE_BPGVIEW=y # Enable for compilation on MacOS X @@ -38,7 +38,7 @@ endif # Emscriptem config -@@ -54,14 +55,17 @@ EMLDFLAGS+=-s NO_FILESYSTEM=1 -s NO_BROW +@@ -54,15 +55,18 @@ EMLDFLAGS+=-s NO_FILESYSTEM=1 -s NO_BROWSER=1 EMLDFLAGS+=-O3 --memory-init-file 0 --closure 0 --pre-js pre.js --post-js post.js EMCFLAGS:=$(CFLAGS) @@ -54,13 +54,14 @@ -CFLAGS+=-g -CXXFLAGS=$(CFLAGS) +CFLAGS_DIST+=-g -+ + +CFLAGS:=${CFLAGS_DIST} ${CFLAGS} +LDFLAGS:=${LDFLAGS_DIST} ${LDFLAGS} +CXXFLAGS=${CFLAGS} - ++ PROGS=bpgdec$(EXE) bpgenc$(EXE) ifdef USE_BPGVIEW + PROGS+=bpgview$(EXE) @@ -71,7 +75,7 @@ ifdef USE_EMCC PROGS+=bpgdec.js bpgdec8.js bpgdec8a.js endif @@ -70,7 +71,7 @@ LIBBPG_OBJS:=$(addprefix libavcodec/, \ hevc_cabac.o hevc_filter.o hevc.o hevcpred.o hevc_refs.o\ -@@ -99,35 +103,12 @@ BPGENC_LIBS:= +@@ -99,36 +103,13 @@ BPGENC_LIBS:= ifdef USE_X265 @@ -81,7 +82,7 @@ bpgenc.o: CFLAGS+=-DUSE_X265 -x265_glue.o: CFLAGS+=-I./x265/source -I./x265.out/8bit -x265_glue.o: $(X265_LIBS) -- + -ifdef CONFIG_WIN32 -CMAKE_OPTS:=-DCMAKE_TOOLCHAIN_FILE=../../x265/build/msys/toolchain-x86_64-w64-mingw32.cmake -else @@ -99,21 +100,22 @@ - $(MAKE) -C x265.out/12bit - $(MAKE) -C x265.out/10bit - $(MAKE) -C x265.out/8bit - +- x265_clean: - rm -rf x265.out -- --$(X265_LIBS): x265_make +-$(X265_LIBS): x265_make +- else -@@ -190,6 +171,9 @@ bpgenc.o: CFLAGS+=-Wno-unused-but-set-va + x265_clean: +@@ -189,6 +170,9 @@ bpgenc.o: CFLAGS+=-Wno-unused-but-set-variable + libbpg.a: $(LIBBPG_OBJS) $(AR) rcs $@ $^ - -+libbpg.so: $(LIBBPG_OBJS) -+ $(CC) $(LDFLAGS) -shared -o $@ $^ + ++libbpg.so: $(LIBBPG_OBJS) ++ $(CC) $(LDFLAGS) -Wl,--soname=$(shell cat VERSION | cut -f1,2 -d .) -shared -o $@ $^ + bpgdec$(EXE): bpgdec.o libbpg.a $(CC) $(LDFLAGS) -o $@ $^ $(BPGDEC_LIBS) - diff --git a/graphics/libbpg/pkg-plist b/graphics/libbpg/pkg-plist index 9877f9ccdb9a..d14a5e08d7ec 100644 --- a/graphics/libbpg/pkg-plist +++ b/graphics/libbpg/pkg-plist @@ -3,4 +3,6 @@ bin/bpgenc %%SDL%%bin/bpgview include/libbpg.h lib/libbpg.a +lib/libbpg.so.0.9 +lib/libbpg.so.0 lib/libbpg.so
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202106090821.1598Lv12017285>