diff --git a/graphics/libbpg/Makefile b/graphics/libbpg/Makefile index 57e7c2d8c7a2..45d106d49fc9 100644 --- a/graphics/libbpg/Makefile +++ b/graphics/libbpg/Makefile @@ -1,53 +1,58 @@ # Created by: Matthieu Volat PORTNAME= libbpg -PORTVERSION= 0.9.7 -PORTREVISION= 11 +PORTVERSION= 0.9.8 CATEGORIES= graphics MASTER_SITES= http://bellard.org/bpg/ MAINTAINER= mazhe@alkumuna.eu COMMENT= BPG (Better Portable Graphics) is a new image format LICENSE= BSD2CLAUSE LGPL21 LICENSE_COMB= multi 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 X265_LIB_DEPENDS= libx265.so:multimedia/x265 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 do-configure-X265-off: ${REINPLACE_CMD} -e 's/^USE_X265=y$$/#USE_X265=/' ${WRKSRC}/Makefile 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 .include 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,119 +1,121 @@ ---- 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 #CONFIG_APPLE=y # Installation prefix -prefix=/usr/local +prefix=${DESTDIR}${PREFIX} ################################# @@ -31,19 +31,20 @@ CROSS_PREFIX:= EXE:= endif -CC=$(CROSS_PREFIX)gcc -CXX=$(CROSS_PREFIX)g++ -AR=$(CROSS_PREFIX)ar +CC?=$(CROSS_PREFIX)gcc +CXX?=$(CROSS_PREFIX)g++ +AR?=$(CROSS_PREFIX)ar +LD?=$(CROSS_PREFIX)ld EMCC=emcc PWD:=$(shell pwd) -CFLAGS:=-Os -Wall -MMD -fno-asynchronous-unwind-tables -fdata-sections -ffunction-sections -fno-math-errno -fno-signed-zeros -fno-tree-vectorize -fomit-frame-pointer -CFLAGS+=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_REENTRANT -CFLAGS+=-I. -CFLAGS+=-DCONFIG_BPG_VERSION=\"$(shell cat VERSION)\" +CFLAGS_DIST:=-Os -Wall -MMD -fno-asynchronous-unwind-tables -fdata-sections -ffunction-sections -fno-math-errno -fno-signed-zeros -fno-tree-vectorize -fomit-frame-pointer +CFLAGS_DIST+=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_REENTRANT +CFLAGS_DIST+=-I. +CFLAGS_DIST+=-DCONFIG_BPG_VERSION=\"$(shell cat VERSION)\" ifdef USE_JCTVC_HIGH_BIT_DEPTH -CFLAGS+=-DRExt__HIGH_BIT_DEPTH_SUPPORT +CFLAGS_DIST+=-DRExt__HIGH_BIT_DEPTH_SUPPORT 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) -LDFLAGS=-g +LDFLAGS_DIST=-g ifdef CONFIG_APPLE -LDFLAGS+=-Wl,-dead_strip +LDFLAGS_DIST+=-Wl,-dead_strip else -LDFLAGS+=-Wl,--gc-sections +LDFLAGS_DIST+=-Wl,--gc-sections endif -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 -all: $(PROGS) +all: libbpg.a libbpg.so $(PROGS) 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 -X265_LIBS:=./x265.out/8bit/libx265.a ./x265.out/10bit/libx265.a ./x265.out/12bit/libx265.a BPGENC_OBJS+=x265_glue.o $(X265_LIBS) +BPGENC_LIBS+=$(X265_LIBS) 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 -CMAKE_OPTS:= -endif - -x265.out: - mkdir -p x265.out/8bit x265.out/10bit x265.out/12bit - cd x265.out/12bit && cmake ../../x265/source $(CMAKE_OPTS) -DHIGH_BIT_DEPTH=ON -DEXPORT_C_API=OFF -DENABLE_SHARED=OFF -DENABLE_CLI=OFF -DMAIN12=ON - cd x265.out/10bit && cmake ../../x265/source $(CMAKE_OPTS) -DHIGH_BIT_DEPTH=ON -DEXPORT_C_API=OFF -DENABLE_SHARED=OFF -DENABLE_CLI=OFF -DMAIN10=ON - cd x265.out/8bit && cmake ../../x265/source $(CMAKE_OPTS) -DLINKED_10BIT=ON -DLINKED_12BIT=ON -DENABLE_SHARED=OFF -DENABLE_CLI=OFF - -# use this target to manually rebuild x265 -x265_make: | x265.out - $(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 @@ -1,6 +1,8 @@ bin/bpgdec bin/bpgenc %%SDL%%bin/bpgview include/libbpg.h lib/libbpg.a +lib/libbpg.so.0.9 +lib/libbpg.so.0 lib/libbpg.so