Attachment #225655 for bug #256243




# Created by: Matthieu Volat <mazhe@alkumuna.eu>

PORTNAME=	libbpg
PORTVERSION=	0.9.8
PORTREVISION=	11
CATEGORIES=	graphics
MASTER_SITES=	http://bellard.org/bpg/


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 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, need JCTVC)
JCTVCHI_IMPLIES=	JCTVC

SDL_USES=	sdl
SDL_USE=	SDL=image

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


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/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

Lines 1-3 Link Here

(-)b/graphics/libbpg/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1463397263	1	TIMESTAMP = 1622264337
2	SHA256 (libbpg-0.9.7.tar.gz) = 05035862ff4ffca0280261871486f44e74c4af4337c931e0858483551e6efe25	2	SHA256 (libbpg-0.9.8.tar.gz) = c0788e23bdf1a7d36cb4424ccb2fae4c7789ac94949563c4ad0e2569d3bf0095
3	SIZE (libbpg-0.9.7.tar.gz) = 2028932	3	SIZE (libbpg-0.9.8.tar.gz) = 2029021




--- Makefile.orig	2018-04-21 09:42:55 UTC
+++ Makefile
@@ -17,7 +17,7 @@ USE_BPGVIEW=y
 # Enable for compilation on MacOS X

 endif
 
 # Emscriptem config
@@ -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)
 

-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

 
 LIBBPG_OBJS:=$(addprefix libavcodec/, \
 hevc_cabac.o  hevc_filter.o  hevc.o         hevcpred.o  hevc_refs.o\
@@ -99,36 +103,13 @@ BPGENC_LIBS:=
 
 ifdef USE_X265
 

 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

-	$(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
 
 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)
 

Lines 3-6 bin/bpgenc Link Here

(-)b/graphics/libbpg/pkg-plist (+2 lines)
3	%%SDL%%bin/bpgview	3	%%SDL%%bin/bpgview
4	include/libbpg.h	4	include/libbpg.h
5	lib/libbpg.a	5	lib/libbpg.a
		6	lib/libbpg.so.0.9
		7	lib/libbpg.so.0
6	lib/libbpg.so	8	lib/libbpg.so

Return to bug 256243

Lines 1-8 Link Here

(-)b/graphics/libbpg/Makefile (-6 / +11 lines)
1	# Created by: Matthieu Volat <mazhe@alkumuna.eu>	1	# Created by: Matthieu Volat <mazhe@alkumuna.eu>
2		2
3	PORTNAME= libbpg	3	PORTNAME= libbpg
4	PORTVERSION= 0.9.7	4	PORTVERSION= 0.9.8
5	PORTREVISION= 11
6	CATEGORIES= graphics	5	CATEGORIES= graphics
7	MASTER_SITES= http://bellard.org/bpg/	6	MASTER_SITES= http://bellard.org/bpg/
8		7
Lines 17-31 LIB_DEPENDS= libpng.so:graphics/png Link Here
17	USES= compiler:c++11-lib gmake jpeg localbase:ldflags	16	USES= compiler:c++11-lib gmake jpeg localbase:ldflags
18	USE_LDCONFIG= yes	17	USE_LDCONFIG= yes
19		18
20	CFLAGS+= -fPIC
21	MAKE_ARGS+= X265_LIBS=${X265_LIBS}	19	MAKE_ARGS+= X265_LIBS=${X265_LIBS}
		20	CFLAGS+= -fPIC
22		21
23	OPTIONS_DEFINE= SDL JCTVC X265	22	OPTIONS_DEFINE= SDL JCTVC JCTVCHI X265
24	OPTIONS_DEFAULT=SDL X265	23	OPTIONS_DEFAULT=SDL X265
25	OPTIONS_SUB= yes	24	OPTIONS_SUB= yes
26		25
27	JCTVC_DESC= Enable JCTVC (best quality but slow) for the encoder	26	JCTVC_DESC= Enable JCTVC (best quality but slow) for the encoder
28	JCTVCHI_DESC= Use bit depths > 12 with JCTVC (experimental)	27	JCTVCHI_DESC= Use bit depths > 12 with JCTVC (experimental, need JCTVC)
		28	JCTVCHI_IMPLIES= JCTVC
29		29
30	SDL_USES= sdl	30	SDL_USES= sdl
31	SDL_USE= SDL=image	31	SDL_USE= SDL=image
Lines 36-41 X265_VARS= x265_libs=${PREFIX}/lib/libx265.so Link Here
36	do-configure-JCTVC-off:	36	do-configure-JCTVC-off:
37	${REINPLACE_CMD} -e 's/^USE_JCTVC=y$$/#USE_JCTVC=/' ${WRKSRC}/Makefile	37	${REINPLACE_CMD} -e 's/^USE_JCTVC=y$$/#USE_JCTVC=/' ${WRKSRC}/Makefile
38		38
		39	do-configure-JCTVCHI-on:
		40	${REINPLACE_CMD} -e 's/^#USE_JCTVC_HIGH_BIT_DEPTH=y$$/USE_JCTVC_HIGH_BIT_DEPTH=y/' ${WRKSRC}/Makefile
		41
39	do-configure-SDL-off:	42	do-configure-SDL-off:
40	${REINPLACE_CMD} -e 's/^USE_BPGVIEW=y$$/#USE_BPGVIEW=/' ${WRKSRC}/Makefile	43	${REINPLACE_CMD} -e 's/^USE_BPGVIEW=y$$/#USE_BPGVIEW=/' ${WRKSRC}/Makefile
41		44
Lines 45-51 do-configure-X265-off: Link Here
45	post-install:	48	post-install:
46	${INSTALL_DATA} ${WRKSRC}/libbpg.h ${STAGEDIR}${PREFIX}/include	49	${INSTALL_DATA} ${WRKSRC}/libbpg.h ${STAGEDIR}${PREFIX}/include
47	${INSTALL_DATA} ${WRKSRC}/libbpg.a ${STAGEDIR}${PREFIX}/lib	50	${INSTALL_DATA} ${WRKSRC}/libbpg.a ${STAGEDIR}${PREFIX}/lib
48	${INSTALL_LIB} ${WRKSRC}/libbpg.so ${STAGEDIR}${PREFIX}/lib	51	${INSTALL_LIB} ${WRKSRC}/libbpg.so ${STAGEDIR}${PREFIX}/lib/libbpg.so.${DISTVERSION:R}
		52	${LN} -sf libbpg.so.${DISTVERSION:R} ${STAGEDIR}${PREFIX}/lib/libbpg.so.${DISTVERSION:R:R}
		53	${LN} -sf libbpg.so.${DISTVERSION:R:R} ${STAGEDIR}${PREFIX}/lib/libbpg.so
49		54
50	post-install-SDL-on:	55	post-install-SDL-on:
51	${INSTALL_PROGRAM} ${WRKSRC}/bpgview ${STAGEDIR}${PREFIX}/bin	56	${INSTALL_PROGRAM} ${WRKSRC}/bpgview ${STAGEDIR}${PREFIX}/bin

Lines 1-4 Link Here

(-)b/graphics/libbpg/files/patch-Makefile (-14 / +16 lines)
1	--- Makefile.orig 2016-05-15 09:06:19 UTC	1	--- Makefile.orig 2018-04-21 09:42:55 UTC
2	+++ Makefile	2	+++ Makefile
3	@@ -17,7 +17,7 @@ USE_BPGVIEW=y	3	@@ -17,7 +17,7 @@ USE_BPGVIEW=y
4	# Enable for compilation on MacOS X	4	# Enable for compilation on MacOS X
Lines 38-44 Link Here
38	endif	38	endif
39		39
40	# Emscriptem config	40	# Emscriptem config
41	@@ -54,14 +55,17 @@ EMLDFLAGS+=-s NO_FILESYSTEM=1 -s NO_BROW	41	@@ -54,15 +55,18 @@ EMLDFLAGS+=-s NO_FILESYSTEM=1 -s NO_BROWSER=1
42	EMLDFLAGS+=-O3 --memory-init-file 0 --closure 0 --pre-js pre.js --post-js post.js	42	EMLDFLAGS+=-O3 --memory-init-file 0 --closure 0 --pre-js pre.js --post-js post.js
43	EMCFLAGS:=$(CFLAGS)	43	EMCFLAGS:=$(CFLAGS)
44		44
Lines 54-66 Link Here
54	-CFLAGS+=-g	54	-CFLAGS+=-g
55	-CXXFLAGS=$(CFLAGS)	55	-CXXFLAGS=$(CFLAGS)
56	+CFLAGS_DIST+=-g	56	+CFLAGS_DIST+=-g
57	+	57
58	+CFLAGS:=${CFLAGS_DIST} ${CFLAGS}	58	+CFLAGS:=${CFLAGS_DIST} ${CFLAGS}
59	+LDFLAGS:=${LDFLAGS_DIST} ${LDFLAGS}	59	+LDFLAGS:=${LDFLAGS_DIST} ${LDFLAGS}
60	+CXXFLAGS=${CFLAGS}	60	+CXXFLAGS=${CFLAGS}
61		61	+
62	PROGS=bpgdec$(EXE) bpgenc$(EXE)	62	PROGS=bpgdec$(EXE) bpgenc$(EXE)
63	ifdef USE_BPGVIEW	63	ifdef USE_BPGVIEW
		64	PROGS+=bpgview$(EXE)
64	@@ -71,7 +75,7 @@ ifdef USE_EMCC	65	@@ -71,7 +75,7 @@ ifdef USE_EMCC
65	PROGS+=bpgdec.js bpgdec8.js bpgdec8a.js	66	PROGS+=bpgdec.js bpgdec8.js bpgdec8a.js
66	endif	67	endif
Lines 70-76 Link Here
70		71
71	LIBBPG_OBJS:=$(addprefix libavcodec/, \	72	LIBBPG_OBJS:=$(addprefix libavcodec/, \
72	hevc_cabac.o hevc_filter.o hevc.o hevcpred.o hevc_refs.o\	73	hevc_cabac.o hevc_filter.o hevc.o hevcpred.o hevc_refs.o\
73	@@ -99,35 +103,12 @@ BPGENC_LIBS:=	74	@@ -99,36 +103,13 @@ BPGENC_LIBS:=
74		75
75	ifdef USE_X265	76	ifdef USE_X265
76		77
Lines 81-87 Link Here
81	bpgenc.o: CFLAGS+=-DUSE_X265	82	bpgenc.o: CFLAGS+=-DUSE_X265
82	-x265_glue.o: CFLAGS+=-I./x265/source -I./x265.out/8bit	83	-x265_glue.o: CFLAGS+=-I./x265/source -I./x265.out/8bit
83	-x265_glue.o: $(X265_LIBS)	84	-x265_glue.o: $(X265_LIBS)
84	-	85
85	-ifdef CONFIG_WIN32	86	-ifdef CONFIG_WIN32
86	-CMAKE_OPTS:=-DCMAKE_TOOLCHAIN_FILE=../../x265/build/msys/toolchain-x86_64-w64-mingw32.cmake	87	-CMAKE_OPTS:=-DCMAKE_TOOLCHAIN_FILE=../../x265/build/msys/toolchain-x86_64-w64-mingw32.cmake
87	-else	88	-else
Lines 99-119 Link Here
99	- $(MAKE) -C x265.out/12bit	100	- $(MAKE) -C x265.out/12bit
100	- $(MAKE) -C x265.out/10bit	101	- $(MAKE) -C x265.out/10bit
101	- $(MAKE) -C x265.out/8bit	102	- $(MAKE) -C x265.out/8bit
102		103	-
103	x265_clean:	104	x265_clean:
104	- rm -rf x265.out	105	- rm -rf x265.out
105	-
106	-$(X265_LIBS): x265_make
107		106
		107	-$(X265_LIBS): x265_make
		108	-
108	else	109	else
109		110
110	@@ -190,6 +171,9 @@ bpgenc.o: CFLAGS+=-Wno-unused-but-set-va	111	x265_clean:
		112	@@ -189,6 +170,9 @@ bpgenc.o: CFLAGS+=-Wno-unused-but-set-variable
		113
111	libbpg.a: $(LIBBPG_OBJS)	114	libbpg.a: $(LIBBPG_OBJS)
112	$(AR) rcs $@ $^	115	$(AR) rcs $@ $^
113
114	+libbpg.so: $(LIBBPG_OBJS)
115	+ $(CC) $(LDFLAGS) -shared -o $@ $^
116	+	116	+
		117	+libbpg.so: $(LIBBPG_OBJS)
		118	+ $(CC) $(LDFLAGS) -Wl,--soname=$(shell cat VERSION \| cut -f1,2 -d .) -shared -o $@ $^
		119
117	bpgdec$(EXE): bpgdec.o libbpg.a	120	bpgdec$(EXE): bpgdec.o libbpg.a
118	$(CC) $(LDFLAGS) -o $@ $^ $(BPGDEC_LIBS)	121	$(CC) $(LDFLAGS) -o $@ $^ $(BPGDEC_LIBS)
119