Attachment #220052 for bug #251442




# $FreeBSD$

PORTNAME=	libde265
PORTVERSION=	1.0.2
PORTREVISION=	5
DISTVERSIONPREFIX=	v
DISTVERSION=	1.0.8
CATEGORIES=	multimedia

MAINTAINER=	kwm@FreeBSD.org
COMMENT=	Open source h.265 video codec

LICENSE=	LGPL3
LICENSE_FILE=	${WRKSRC}/COPYING

USES=		autoreconf compiler:c++11-lib libtool pathfix pkgconfig
GNU_CONFIGURE=	yes
CONFIGURE_ARGS=	--disable-sherlock265 --disable-dec265
USE_LDCONFIG=	yes
INSTALL_TARGET=	install-strip

USE_GITHUB=	yes
GH_ACCOUNT=	strukturag

.include <bsd.port.pre.mk>

.if ${ARCH} == "armv6" || ${ARCH} == "armv7"
BUILD_DEPENDS+=	${LOCALBASE}/bin/as:devel/binutils
CONFIGURE_ENV+=	CCASFLAGS="${CFLAGS} -B${LOCALBASE}/bin -no-integrated-as"
LLD_UNSAFE=	yes
.endif

.include <bsd.port.post.mk>

Lines 1-2 Link Here

(-)multimedia/libde265/distinfo (-2 / +3 lines)
1	SHA256 (strukturag-libde265-v1.0.2_GH0.tar.gz) = c9769a621d568bf5d1e687453cb5d996d7a813476813edb4752ce0fea437fca8	1	TIMESTAMP = 1606613454
2	SIZE (strukturag-libde265-v1.0.2_GH0.tar.gz) = 381737	2	SHA256 (strukturag-libde265-v1.0.8_GH0.tar.gz) = c5ab61185f283f46388c700c43dc08606b0e260cd53f06b967ec0ad7a809ff11
		3	SIZE (strukturag-libde265-v1.0.8_GH0.tar.gz) = 381963




--- configure.ac.orig	2015-07-14 13:51:51.000000000 +0200
+++ configure.ac	2015-07-22 16:42:42.854395000 +0200
@@ -36,8 +36,8 @@
 # Initialize automake stuff
 AM_INIT_AUTOMAKE
 
-CFLAGS+=" -std=c99"
-CXXFLAGS+=" -Werror=return-type -Werror=unused-result -Werror=reorder"
+CFLAGS="$CFLAGS -std=c99"
+CXXFLAGS="$CXXFLAGS -Werror=return-type -Werror=unused-result -Werror=reorder"
 AX_CXX_COMPILE_STDCXX_11()
 
 dnl Use -Wall if we have gcc.
@@ -101,8 +101,8 @@
 ],[],[need_strict_ansi=no],[need_strict_ansi=yes]);
 AC_LANG_POP(C++)
 if eval "test x$need_strict_ansi = xyes"; then
-  CFLAGS+=" -D__STRICT_ANSI__"
-  CXXFLAGS+=" -D__STRICT_ANSI__"
+  CFLAGS="$CFLAGS -D__STRICT_ANSI__"
+  CXXFLAGS="$CXXFLAGS -D__STRICT_ANSI__"
 fi
 AC_MSG_RESULT([$need_strict_ansi])
 
@@ -180,7 +180,7 @@
   [enable_log_error=$enableval],
   [enable_log_error=yes])
 if eval "test $enable_log_error = yes"; then
-  CXXFLAGS+=" -DDE265_LOG_ERROR"
+  CXXFLAGS="$CXXFLAGS -DDE265_LOG_ERROR"
 fi
 
 AC_ARG_ENABLE(log-info,
@@ -189,7 +189,7 @@
   [enable_log_info=$enableval],
   [enable_log_info=no])
 if eval "test $enable_log_info = yes"; then
-  CXXFLAGS+=" -DDE265_LOG_INFO"
+  CXXFLAGS="$CXXFLAGS -DDE265_LOG_INFO"
 fi
 
 AC_ARG_ENABLE(log-debug,
@@ -198,7 +198,7 @@
   [enable_log_debug=$enableval],
   [enable_log_debug=no])
 if eval "test $enable_log_debug = yes"; then
-  CXXFLAGS+=" -DDE265_LOG_DEBUG"
+  CXXFLAGS="$CXXFLAGS -DDE265_LOG_DEBUG"
 fi
 
 AC_ARG_ENABLE(log-trace,
@@ -207,7 +207,7 @@
   [enable_log_trace=$enableval],
   [enable_log_trace=no])
 if eval "test $enable_log_trace = yes"; then
-  CXXFLAGS+=" -DDE265_LOG_TRACE"
+  CXXFLAGS="$CXXFLAGS -DDE265_LOG_TRACE"
 fi
 
 




--- libde265/Makefile.am.orig	2015-07-22 17:41:19.854783000 +0200
+++ libde265/Makefile.am	2015-07-22 17:41:35.651508000 +0200
@@ -19,7 +19,6 @@
 endif
 
 libde265_la_LDFLAGS = -version-info $(LIBDE265_CURRENT):$(LIBDE265_REVISION):$(LIBDE265_AGE)
-libde265_la_LIBADD = -lstdc++
 
 libde265_la_SOURCES = \
   acceleration.h \
@@ -92,7 +91,7 @@
   vui.h
 
 SUBDIRS = encoder
-libde265_la_LIBADD += encoder/libde265_encoder.la
+libde265_la_LIBADD = encoder/libde265_encoder.la
 
 if ENABLE_SSE_OPT
   SUBDIRS += x86

Removed Link Here

(-)multimedia/libde265/files/patch-libde265_fallback-dct.cc (-11 lines)
1	--- libde265/fallback-dct.cc.orig 2015-07-14 13:51:51.000000000 +0200
2	+++ libde265/fallback-dct.cc 2015-07-22 17:24:55.690743000 +0200
3	@@ -22,7 +22,7 @@
4
5	#if defined(_MSC_VER) \|\| defined(__MINGW32__)
6	# include <malloc.h>
7	-#else
8	+#elif defined(HAVE_ALLOCA_H)
9	# include <alloca.h>
10	#endif
11

Removed Link Here

(-)multimedia/libde265/files/patch-libde265_fallback-motion.cc (-11 lines)
1	--- libde265/fallback-motion.cc.orig 2015-07-14 13:51:51.000000000 +0200
2	+++ libde265/fallback-motion.cc 2015-07-22 17:25:04.707534000 +0200
3	@@ -23,7 +23,7 @@
4
5	#if defined(_MSC_VER) \|\| defined(__MINGW32__)
6	# include <malloc.h>
7	-#else
8	+#elif defined(HAVE_ALLOCA_H)
9	# include <alloca.h>
10	#endif
11

Removed Link Here

(-)multimedia/libde265/files/patch-libde265_image.cc (-11 lines)
1	--- libde265/image.cc.orig 2015-07-14 13:51:51.000000000 +0200
2	+++ libde265/image.cc 2015-07-22 17:32:34.455583000 +0200
3	@@ -47,7 +47,7 @@
4	#elif _WIN32
5	#define ALLOC_ALIGNED(alignment, size) _aligned_malloc((size), (alignment))
6	#define FREE_ALIGNED(mem) _aligned_free((mem))
7	-#elif __APPLE__
8	+#elif defined(HAVE_POSIX_MEMALIGN)
9	static inline void *ALLOC_ALIGNED(size_t alignment, size_t size) {
10	void *mem = NULL;
11	if (posix_memalign(&mem, alignment, size) != 0) {

Removed Link Here

(-)multimedia/libde265/files/patch-libde265_motion.cc (-11 lines)
1	--- libde265/motion.cc.orig 2015-07-14 13:51:51.000000000 +0200
2	+++ libde265/motion.cc 2015-07-22 17:25:26.140610000 +0200
3	@@ -31,7 +31,7 @@
4
5	#if defined(_MSC_VER) \|\| defined(__MINGW32__)
6	# include <malloc.h>
7	-#else
8	+#elif defined(HAVE_ALLOCA_H)
9	# include <alloca.h>
10	#endif
11

Removed Link Here

(-)multimedia/libde265/files/patch-libde265_pps.cc (-11 lines)
1	--- libde265/pps.cc.orig 2015-07-14 13:51:51.000000000 +0200
2	+++ libde265/pps.cc 2015-07-22 17:25:38.546345000 +0200
3	@@ -27,7 +27,7 @@
4	#include <string.h>
5	#if defined(_MSC_VER) \|\| defined(__MINGW32__)
6	# include <malloc.h>
7	-#else
8	+#elif defined(HAVE_ALLOCA_H)
9	# include <alloca.h>
10	#endif
11

Removed Link Here

(-)multimedia/libde265/files/patch-libde265_refpic.cc (-11 lines)
1	--- libde265/refpic.cc.orig 2015-07-14 13:51:51.000000000 +0200
2	+++ libde265/refpic.cc 2015-07-22 17:25:52.916195000 +0200
3	@@ -26,7 +26,7 @@
4	#include <stdlib.h>
5	#if defined(_MSC_VER) \|\| defined(__MINGW32__)
6	# include <malloc.h>
7	-#else
8	+#elif defined(HAVE_ALLOCA_H)
9	# include <alloca.h>
10	#endif
11

Removed Link Here

(-)multimedia/libde265/files/patch-libde265_threads.cc (-11 lines)
1	--- libde265/threads.cc.orig 2015-07-14 13:51:51.000000000 +0200
2	+++ libde265/threads.cc 2015-07-22 17:26:03.712606000 +0200
3	@@ -24,7 +24,7 @@
4
5	#if defined(_MSC_VER) \|\| defined(__MINGW32__)
6	# include <malloc.h>
7	-#else
8	+#elif defined(HAVE_ALLOCA_H)
9	# include <alloca.h>
10	#endif
11

Removed Link Here

(-)multimedia/libde265/files/patch-libde265_util.h (-11 lines)
1	--- libde265/util.h.orig 2015-07-22 16:48:18.032493000 +0200
2	+++ libde265/util.h 2015-07-22 16:48:43.439129000 +0200
3	@@ -70,7 +70,7 @@
4	namespace std { using namespace std::tr1; }
5	#endif
6
7	-#if __GNUC__ && GCC_VERSION < 40600
8	+#if __GNUC__ && GCC_VERSION < 40600 && !defined(__clang__)
9	// nullptr was introduced in gcc 4.6, a simple alias should be fine for our use case
10	#define nullptr NULL
11	#endif

Lines 1-3 Link Here

(-)multimedia/libde265/pkg-plist (-1 / +2 lines)
		1	bin/acceleration_speed
1	bin/bjoentegaard	2	bin/bjoentegaard
2	bin/block-rate-estim	3	bin/block-rate-estim
3	bin/enc265	4	bin/enc265
Lines 10-14 Link Here
10	lib/libde265.a	11	lib/libde265.a
11	lib/libde265.so	12	lib/libde265.so
12	lib/libde265.so.0	13	lib/libde265.so.0
13	lib/libde265.so.0.0.10	14	lib/libde265.so.0.1.1
14	libdata/pkgconfig/libde265.pc	15	libdata/pkgconfig/libde265.pc

Return to bug 251442

Lines 2-28 Link Here

(-)multimedia/libde265/Makefile (-7 / +11 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= libde265	4	PORTNAME= libde265
5	PORTVERSION= 1.0.2
6	PORTREVISION= 5
7	DISTVERSIONPREFIX= v	5	DISTVERSIONPREFIX= v
		6	DISTVERSION= 1.0.8
8	CATEGORIES= multimedia	7	CATEGORIES= multimedia
9		8
10	MAINTAINER= kwm@FreeBSD.org	9	MAINTAINER= kwm@FreeBSD.org
11	COMMENT= Open source h.265 video codec	10	COMMENT= Open source h.265 video codec
12		11
13	USE_GITHUB= yes	12	LICENSE= LGPL3
14	GH_ACCOUNT= strukturag	13	LICENSE_FILE= ${WRKSRC}/COPYING
15		14
16	USES= autoreconf compiler:c++11-lib libtool pathfix pkgconfig	15	USES= autoreconf compiler:c++11-lib libtool pathfix pkgconfig
17	GNU_CONFIGURE= yes	16	GNU_CONFIGURE= yes
18	CONFIGURE_ARGS= --disable-sherlock265 --disable-dec265	17	CONFIGURE_ARGS= --disable-sherlock265 --disable-dec265
		18	USE_LDCONFIG= yes
		19	INSTALL_TARGET= install-strip
		20
		21	USE_GITHUB= yes
		22	GH_ACCOUNT= strukturag
19		23
20	.include <bsd.port.pre.mk>	24	.include <bsd.port.pre.mk>
21		25
22	.if ${ARCH} == "armv6" \|\| ${ARCH} == "armv7"	26	.if ${ARCH} == "armv6" \|\| ${ARCH} == "armv7"
23	BUILD_DEPENDS+= ${LOCALBASE}/bin/as:devel/binutils	27	BUILD_DEPENDS+= ${LOCALBASE}/bin/as:devel/binutils
24	CONFIGURE_ENV+= CCASFLAGS="${CFLAGS} -B${LOCALBASE}/bin -no-integrated-as"	28	CONFIGURE_ENV+= CCASFLAGS="${CFLAGS} -B${LOCALBASE}/bin -no-integrated-as"
25	LLD_UNSAFE= yes	29	LLD_UNSAFE= yes
26	.endif	30	.endif
27		31
28	.include <bsd.port.post.mk>	32	.include <bsd.port.post.mk>

Removed Link Here

(-)multimedia/libde265/files/patch-configure.ac (-60 lines)
1	--- configure.ac.orig 2015-07-14 13:51:51.000000000 +0200
2	+++ configure.ac 2015-07-22 16:42:42.854395000 +0200
3	@@ -36,8 +36,8 @@
4	# Initialize automake stuff
5	AM_INIT_AUTOMAKE
6
7	-CFLAGS+=" -std=c99"
8	-CXXFLAGS+=" -Werror=return-type -Werror=unused-result -Werror=reorder"
9	+CFLAGS="$CFLAGS -std=c99"
10	+CXXFLAGS="$CXXFLAGS -Werror=return-type -Werror=unused-result -Werror=reorder"
11	AX_CXX_COMPILE_STDCXX_11()
12
13	dnl Use -Wall if we have gcc.
14	@@ -101,8 +101,8 @@
15	],[],[need_strict_ansi=no],[need_strict_ansi=yes]);
16	AC_LANG_POP(C++)
17	if eval "test x$need_strict_ansi = xyes"; then
18	- CFLAGS+=" -D__STRICT_ANSI__"
19	- CXXFLAGS+=" -D__STRICT_ANSI__"
20	+ CFLAGS="$CFLAGS -D__STRICT_ANSI__"
21	+ CXXFLAGS="$CXXFLAGS -D__STRICT_ANSI__"
22	fi
23	AC_MSG_RESULT([$need_strict_ansi])
24
25	@@ -180,7 +180,7 @@
26	[enable_log_error=$enableval],
27	[enable_log_error=yes])
28	if eval "test $enable_log_error = yes"; then
29	- CXXFLAGS+=" -DDE265_LOG_ERROR"
30	+ CXXFLAGS="$CXXFLAGS -DDE265_LOG_ERROR"
31	fi
32
33	AC_ARG_ENABLE(log-info,
34	@@ -189,7 +189,7 @@
35	[enable_log_info=$enableval],
36	[enable_log_info=no])
37	if eval "test $enable_log_info = yes"; then
38	- CXXFLAGS+=" -DDE265_LOG_INFO"
39	+ CXXFLAGS="$CXXFLAGS -DDE265_LOG_INFO"
40	fi
41
42	AC_ARG_ENABLE(log-debug,
43	@@ -198,7 +198,7 @@
44	[enable_log_debug=$enableval],
45	[enable_log_debug=no])
46	if eval "test $enable_log_debug = yes"; then
47	- CXXFLAGS+=" -DDE265_LOG_DEBUG"
48	+ CXXFLAGS="$CXXFLAGS -DDE265_LOG_DEBUG"
49	fi
50
51	AC_ARG_ENABLE(log-trace,
52	@@ -207,7 +207,7 @@
53	[enable_log_trace=$enableval],
54	[enable_log_trace=no])
55	if eval "test $enable_log_trace = yes"; then
56	- CXXFLAGS+=" -DDE265_LOG_TRACE"
57	+ CXXFLAGS="$CXXFLAGS -DDE265_LOG_TRACE"
58	fi
59
60

Removed Link Here

(-)multimedia/libde265/files/patch-libde265_Makefile.am (-19 lines)
1	--- libde265/Makefile.am.orig 2015-07-22 17:41:19.854783000 +0200
2	+++ libde265/Makefile.am 2015-07-22 17:41:35.651508000 +0200
3	@@ -19,7 +19,6 @@
4	endif
5
6	libde265_la_LDFLAGS = -version-info $(LIBDE265_CURRENT):$(LIBDE265_REVISION):$(LIBDE265_AGE)
7	-libde265_la_LIBADD = -lstdc++
8
9	libde265_la_SOURCES = \
10	acceleration.h \
11	@@ -92,7 +91,7 @@
12	vui.h
13
14	SUBDIRS = encoder
15	-libde265_la_LIBADD += encoder/libde265_encoder.la
16	+libde265_la_LIBADD = encoder/libde265_encoder.la
17
18	if ENABLE_SSE_OPT
19	SUBDIRS += x86