Attachment 220052 Details for Bug 251442 – 1.0.8

[patch] 1.0.8

libde265-1.0.8.patch (text/plain), 9.13 KB, created by Charlie Li on 2020-11-29 02:23:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Charlie Li

Created: 2020-11-29 02:23:17 UTC

Size: 9.13 KB

patch

obsolete

>diff -r 7b92d1b8e9a5 multimedia/libde265/Makefile
>--- multimedia/libde265/Makefile	Sun Nov 29 00:32:38 2020 +0000
>+++ multimedia/libde265/Makefile	Sat Nov 28 21:20:16 2020 -0500
>@@ -2,27 +2,31 @@
> # $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
> 
>-USE_GITHUB=	yes
>-GH_ACCOUNT=	strukturag
>+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
>+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>
>diff -r 7b92d1b8e9a5 multimedia/libde265/distinfo
>--- multimedia/libde265/distinfo	Sun Nov 29 00:32:38 2020 +0000
>+++ multimedia/libde265/distinfo	Sat Nov 28 21:20:16 2020 -0500
>@@ -1,2 +1,3 @@
>-SHA256 (strukturag-libde265-v1.0.2_GH0.tar.gz) = c9769a621d568bf5d1e687453cb5d996d7a813476813edb4752ce0fea437fca8
>-SIZE (strukturag-libde265-v1.0.2_GH0.tar.gz) = 381737
>+TIMESTAMP = 1606613454
>+SHA256 (strukturag-libde265-v1.0.8_GH0.tar.gz) = c5ab61185f283f46388c700c43dc08606b0e260cd53f06b967ec0ad7a809ff11
>+SIZE (strukturag-libde265-v1.0.8_GH0.tar.gz) = 381963
>diff -r 7b92d1b8e9a5 multimedia/libde265/files/patch-configure.ac
>--- multimedia/libde265/files/patch-configure.ac	Sun Nov 29 00:32:38 2020 +0000
>+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
>@@ -1,60 +0,0 @@
>---- 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
>- 
>- 
>diff -r 7b92d1b8e9a5 multimedia/libde265/files/patch-libde265_Makefile.am
>--- multimedia/libde265/files/patch-libde265_Makefile.am	Sun Nov 29 00:32:38 2020 +0000
>+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
>@@ -1,19 +0,0 @@
>---- 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
>diff -r 7b92d1b8e9a5 multimedia/libde265/files/patch-libde265_fallback-dct.cc
>--- multimedia/libde265/files/patch-libde265_fallback-dct.cc	Sun Nov 29 00:32:38 2020 +0000
>+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
>@@ -1,11 +0,0 @@
>---- libde265/fallback-dct.cc.orig	2015-07-14 13:51:51.000000000 +0200
>-+++ libde265/fallback-dct.cc	2015-07-22 17:24:55.690743000 +0200
>-@@ -22,7 +22,7 @@
>- 
>- #if defined(_MSC_VER) || defined(__MINGW32__)
>- # include <malloc.h>
>--#else
>-+#elif defined(HAVE_ALLOCA_H)
>- # include <alloca.h>
>- #endif
>- 
>diff -r 7b92d1b8e9a5 multimedia/libde265/files/patch-libde265_fallback-motion.cc
>--- multimedia/libde265/files/patch-libde265_fallback-motion.cc	Sun Nov 29 00:32:38 2020 +0000
>+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
>@@ -1,11 +0,0 @@
>---- libde265/fallback-motion.cc.orig	2015-07-14 13:51:51.000000000 +0200
>-+++ libde265/fallback-motion.cc	2015-07-22 17:25:04.707534000 +0200
>-@@ -23,7 +23,7 @@
>- 
>- #if defined(_MSC_VER) || defined(__MINGW32__)
>- # include <malloc.h>
>--#else
>-+#elif defined(HAVE_ALLOCA_H)
>- # include <alloca.h>
>- #endif
>- 
>diff -r 7b92d1b8e9a5 multimedia/libde265/files/patch-libde265_image.cc
>--- multimedia/libde265/files/patch-libde265_image.cc	Sun Nov 29 00:32:38 2020 +0000
>+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
>@@ -1,11 +0,0 @@
>---- libde265/image.cc.orig	2015-07-14 13:51:51.000000000 +0200
>-+++ libde265/image.cc	2015-07-22 17:32:34.455583000 +0200
>-@@ -47,7 +47,7 @@
>- #elif _WIN32
>- #define ALLOC_ALIGNED(alignment, size)         _aligned_malloc((size), (alignment))
>- #define FREE_ALIGNED(mem)                      _aligned_free((mem))
>--#elif __APPLE__
>-+#elif defined(HAVE_POSIX_MEMALIGN)
>- static inline void *ALLOC_ALIGNED(size_t alignment, size_t size) {
>-     void *mem = NULL;
>-     if (posix_memalign(&mem, alignment, size) != 0) {
>diff -r 7b92d1b8e9a5 multimedia/libde265/files/patch-libde265_motion.cc
>--- multimedia/libde265/files/patch-libde265_motion.cc	Sun Nov 29 00:32:38 2020 +0000
>+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
>@@ -1,11 +0,0 @@
>---- libde265/motion.cc.orig	2015-07-14 13:51:51.000000000 +0200
>-+++ libde265/motion.cc	2015-07-22 17:25:26.140610000 +0200
>-@@ -31,7 +31,7 @@
>- 
>- #if defined(_MSC_VER) || defined(__MINGW32__)
>- # include <malloc.h>
>--#else
>-+#elif defined(HAVE_ALLOCA_H)
>- # include <alloca.h>
>- #endif
>- 
>diff -r 7b92d1b8e9a5 multimedia/libde265/files/patch-libde265_pps.cc
>--- multimedia/libde265/files/patch-libde265_pps.cc	Sun Nov 29 00:32:38 2020 +0000
>+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
>@@ -1,11 +0,0 @@
>---- libde265/pps.cc.orig	2015-07-14 13:51:51.000000000 +0200
>-+++ libde265/pps.cc	2015-07-22 17:25:38.546345000 +0200
>-@@ -27,7 +27,7 @@
>- #include <string.h>
>- #if defined(_MSC_VER) || defined(__MINGW32__)
>- # include <malloc.h>
>--#else
>-+#elif defined(HAVE_ALLOCA_H)
>- # include <alloca.h>
>- #endif
>- 
>diff -r 7b92d1b8e9a5 multimedia/libde265/files/patch-libde265_refpic.cc
>--- multimedia/libde265/files/patch-libde265_refpic.cc	Sun Nov 29 00:32:38 2020 +0000
>+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
>@@ -1,11 +0,0 @@
>---- libde265/refpic.cc.orig	2015-07-14 13:51:51.000000000 +0200
>-+++ libde265/refpic.cc	2015-07-22 17:25:52.916195000 +0200
>-@@ -26,7 +26,7 @@
>- #include <stdlib.h>
>- #if defined(_MSC_VER) || defined(__MINGW32__)
>- # include <malloc.h>
>--#else
>-+#elif defined(HAVE_ALLOCA_H)
>- # include <alloca.h>
>- #endif
>- 
>diff -r 7b92d1b8e9a5 multimedia/libde265/files/patch-libde265_threads.cc
>--- multimedia/libde265/files/patch-libde265_threads.cc	Sun Nov 29 00:32:38 2020 +0000
>+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
>@@ -1,11 +0,0 @@
>---- libde265/threads.cc.orig	2015-07-14 13:51:51.000000000 +0200
>-+++ libde265/threads.cc	2015-07-22 17:26:03.712606000 +0200
>-@@ -24,7 +24,7 @@
>- 
>- #if defined(_MSC_VER) || defined(__MINGW32__)
>- # include <malloc.h>
>--#else
>-+#elif defined(HAVE_ALLOCA_H)
>- # include <alloca.h>
>- #endif
>- 
>diff -r 7b92d1b8e9a5 multimedia/libde265/files/patch-libde265_util.h
>--- multimedia/libde265/files/patch-libde265_util.h	Sun Nov 29 00:32:38 2020 +0000
>+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
>@@ -1,11 +0,0 @@
>---- libde265/util.h.orig	2015-07-22 16:48:18.032493000 +0200
>-+++ libde265/util.h	2015-07-22 16:48:43.439129000 +0200
>-@@ -70,7 +70,7 @@
>- namespace std { using namespace std::tr1; }
>- #endif
>- 
>--#if __GNUC__ && GCC_VERSION < 40600
>-+#if __GNUC__ && GCC_VERSION < 40600 && !defined(__clang__)
>- // nullptr was introduced in gcc 4.6, a simple alias should be fine for our use case
>- #define nullptr NULL
>- #endif
>diff -r 7b92d1b8e9a5 multimedia/libde265/pkg-plist
>--- multimedia/libde265/pkg-plist	Sun Nov 29 00:32:38 2020 +0000
>+++ multimedia/libde265/pkg-plist	Sat Nov 28 21:20:16 2020 -0500
>@@ -1,3 +1,4 @@
>+bin/acceleration_speed
> bin/bjoentegaard
> bin/block-rate-estim
> bin/enc265
>@@ -10,5 +11,5 @@
> lib/libde265.a
> lib/libde265.so
> lib/libde265.so.0
>-lib/libde265.so.0.0.10
>+lib/libde265.so.0.1.1
> libdata/pkgconfig/libde265.pc

Actions: View | Diff

Attachments on bug 251442: 220052 | 231625