update to libde265-1.0.18, from Brad, small tweak from me (this matches

the newer default case for PKGNAME-*) CVE-2026-33164, CVE-2026-33165
2026-06-17 23:13:55 +02:00 · 2026-04-10 16:27:35 +00:00
parent 19f930a50a
commit 49fadb1ae0
11 changed files with 33 additions and 126 deletions
@@ -1,12 +1,10 @@
 COMMENT-main=	open H.265 video codec implementation
 COMMENT-tools=	tools for libde265 open H.265 video codec

-V=		1.0.15
+V=		1.0.18
 DISTNAME=	libde265-$V
-PKGNAME-main=	${DISTNAME}
-PKGNAME-tools=	libde265-tools-$V

-SHARED_LIBS +=  de265                     2.0 # 0.12
+SHARED_LIBS +=  de265                     3.0 # 0.12

 CATEGORIES=	multimedia

@@ -18,25 +16,20 @@ PERMIT_PACKAGE=	Yes
 WANTLIB += ${COMPILER_LIBCXX} m

 WANTLIB-tools += ${WANTLIB}
-WANTLIB-tools += GL Qt5Core Qt5Gui Qt5Widgets SDL2 X11 X11-xcb Xau Xcursor
-WANTLIB-tools += Xdmcp Xext Xfixes Xi Xrandr Xrender Xss Xxf86vm avutil
-WANTLIB-tools += c de265 double-conversion drm execinfo expat freetype
-WANTLIB-tools += glapi glib-2.0 graphite2 gthread-2.0 harfbuzz iconv
-WANTLIB-tools += icudata icui18n icuuc intl pcre2-16 pcre2-8 png samplerate
-WANTLIB-tools += sndio swscale usbhid xcb xcb-dri2 xcb-dri3 xcb-glx
-WANTLIB-tools += xcb-present xcb-randr xcb-shm xcb-sync xcb-xfixes xshmfence
-WANTLIB-tools += z zstd
+WANTLIB-tools += Qt5Core Qt5Gui Qt5Widgets SDL2 c de265 swscale

 MULTI_PACKAGES=	-main -tools

 SITES=		https://github.com/strukturag/libde265/releases/download/v$V/

+MODULES=	devel/cmake \
+		x11/qt5
+
 COMPILER=	base-clang ports-gcc

-CONFIGURE_STYLE= gnu
-CONFIGURE_ENV=	LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib" \
-		CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include"
+CONFIGURE_ARGS+=-DENABLE_SHERLOCK265=ON

+MODQT5_DEPS=	No
 LIB_DEPENDS-main= ${LIB_DEPENDS}

 LIB_DEPENDS-tools= ${LIB_DEPENDS} \
@@ -1,2 +1,2 @@
-SHA256 (libde265-1.0.15.tar.gz) = ACUZhsKdNNOvcRftBYdJUMh13ZKS0Ba+KdOzdiZmUR0=
-SIZE (libde265-1.0.15.tar.gz) = 846016
+SHA256 (libde265-1.0.18.tar.gz) = gAR487818GIbFJKM6zF1efPosj3kvSqsKbbLi+liu9g=
+SIZE (libde265-1.0.18.tar.gz) = 287704
@@ -0,0 +1,18 @@
+Fix pkg-config Libs.private entry
+
+Index: CMakeLists.txt
+--- CMakeLists.txt.orig
+++ CMakeLists.txt
+@@ -121,11 +121,7 @@ endif()
+ 
+ include(CheckCXXSymbolExists)
+ check_cxx_symbol_exists(_LIBCPP_VERSION cstdlib HAVE_LIBCPP)
+-if(HAVE_LIBCPP)
+-  set(LIBS_PRIVATE "-lc++")
+-else()
+-  set(LIBS_PRIVATE "-lstdc++")
+-endif()
+set(LIBS_PRIVATE "-lpthread -lm")
+ 
+ 
+ option(BUILD_SHARED_LIBS "Build shared library" ON)
@@ -1,12 +0,0 @@
-Index: acceleration-speed/Makefile.in
--- acceleration-speed/Makefile.in.orig
-+++ acceleration-speed/Makefile.in
-@@ -363,7 +363,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/libde265 -I$(top_srcdir)
- acceleration_speed_DEPENDENCIES = ../libde265/libde265.la
- acceleration_speed_CXXFLAGS = 
- acceleration_speed_LDFLAGS = 
-acceleration_speed_LDADD = ../libde265/libde265.la -lstdc++
-+acceleration_speed_LDADD = ../libde265/libde265.la
- acceleration_speed_SOURCES = acceleration-speed.cc \
- 	acceleration-speed.h dct.cc dct.h dct-scalar.cc dct-scalar.h \
- 	$(am__append_1)
@@ -1,12 +0,0 @@
-Index: dec265/Makefile.in
--- dec265/Makefile.in.orig
-+++ dec265/Makefile.in
-@@ -364,7 +364,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/libde265 -I$(top_srcdir)
- dec265_DEPENDENCIES = ../libde265/libde265.la
- dec265_CXXFLAGS = $(am__append_1) $(am__append_3)
- dec265_LDFLAGS = $(am__append_2) $(am__append_4) $(am__append_6)
-dec265_LDADD = ../libde265/libde265.la -lstdc++
-+dec265_LDADD = ../libde265/libde265.la
- dec265_SOURCES = dec265.cc $(am__append_5)
- EXTRA_DIST = Makefile.vc7 \
-   CMakeLists.txt \
@@ -1,12 +0,0 @@
-Index: enc265/Makefile.in
--- enc265/Makefile.in.orig
-+++ enc265/Makefile.in
-@@ -353,7 +353,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/libde265 -I$(top_srcdir)
- enc265_DEPENDENCIES = ../libde265/libde265.la
- enc265_CXXFLAGS = $(am__append_1)
- enc265_LDFLAGS = $(am__append_2)
-enc265_LDADD = ../libde265/libde265.la -lstdc++
-+enc265_LDADD = ../libde265/libde265.la
- enc265_SOURCES = enc265.cc image-io-png.cc image-io-png.h
- EXTRA_DIST = \
-   CMakeLists.txt \
@@ -1,10 +0,0 @@
-Index: libde265.pc.in
--- libde265.pc.in.orig
-+++ libde265.pc.in
-@@ -9,5 +9,5 @@ URL: https://github.com/strukturag/libde265
- Version: @VERSION@
- Requires:
- Libs: -lde265 -L${libdir}
-Libs.private: @LIBS_PRIVATE@
-+Libs.private: -lpthread -lm
- Cflags: -I${includedir}
@@ -1,12 +0,0 @@
-Index: sherlock265/Makefile.in
--- sherlock265/Makefile.in.orig
-+++ sherlock265/Makefile.in
-@@ -368,7 +368,7 @@ sherlock265_DEPENDENCIES = ../libde265/libde265.la
- sherlock265_CXXFLAGS = $(QT_CFLAGS) -std=c++0x -fPIC $(am__append_1) \
- 	$(am__append_3)
- sherlock265_LDFLAGS = $(QT_LIBS) $(am__append_2) $(am__append_4)
-sherlock265_LDADD = ../libde265/libde265.la -lstdc++ -lpthread
-+sherlock265_LDADD = ../libde265/libde265.la -lpthread
- sherlock265_SOURCES = \
-   sherlock265.cc \
-   VideoPlayer.cc \
@@ -1,42 +0,0 @@
-Index: tools/Makefile.in
--- tools/Makefile.in.orig
-+++ tools/Makefile.in
-@@ -372,32 +372,32 @@ AM_CPPFLAGS = -I$(top_srcdir)/libde265 -I$(top_srcdir)
- gen_enc_table_DEPENDENCIES = ../libde265/libde265.la
- gen_enc_table_CXXFLAGS = 
- gen_enc_table_LDFLAGS = 
-gen_enc_table_LDADD = ../libde265/libde265.la -lstdc++
-+gen_enc_table_LDADD = ../libde265/libde265.la
- gen_enc_table_SOURCES = gen-entropy-table.cc
- yuv_distortion_DEPENDENCIES = ../libde265/libde265.la
- yuv_distortion_CXXFLAGS = $(am__append_1)
- yuv_distortion_LDFLAGS = $(am__append_2)
-yuv_distortion_LDADD = ../libde265/libde265.la -lstdc++
-+yuv_distortion_LDADD = ../libde265/libde265.la
- yuv_distortion_SOURCES = yuv-distortion.cc
- rd_curves_DEPENDENCIES = ../libde265/libde265.la
- rd_curves_CXXFLAGS = 
- rd_curves_LDFLAGS = 
-rd_curves_LDADD = ../libde265/libde265.la -lstdc++
-+rd_curves_LDADD = ../libde265/libde265.la
- rd_curves_SOURCES = rd-curves.cc
- block_rate_estim_DEPENDENCIES = ../libde265/libde265.la
- block_rate_estim_CXXFLAGS = 
- block_rate_estim_LDFLAGS = 
-block_rate_estim_LDADD = ../libde265/libde265.la -lstdc++
-+block_rate_estim_LDADD = ../libde265/libde265.la
- block_rate_estim_SOURCES = block-rate-estim.cc
- tests_DEPENDENCIES = ../libde265/libde265.la
- tests_CXXFLAGS = 
- tests_LDFLAGS = 
-tests_LDADD = ../libde265/libde265.la -lstdc++
-+tests_LDADD = ../libde265/libde265.la
- tests_SOURCES = tests.cc
- bjoentegaard_DEPENDENCIES = ../libde265/libde265.la
- bjoentegaard_CXXFLAGS = 
- bjoentegaard_LDFLAGS = 
-bjoentegaard_LDADD = ../libde265/libde265.la -lstdc++
-+bjoentegaard_LDADD = ../libde265/libde265.la
- bjoentegaard_SOURCES = bjoentegaard.cc
- all: all-am
- 
@@ -2,7 +2,10 @@
 include/libde265/
 include/libde265/de265-version.h
 include/libde265/de265.h
-@static-lib lib/libde265.a
-lib/libde265.la
+lib/cmake/
+lib/cmake/libde265/
+lib/cmake/libde265/libde265-config${MODCMAKE_BUILD_SUFFIX}
+lib/cmake/libde265/libde265-config-version.cmake
+lib/cmake/libde265/libde265-config.cmake
@lib lib/libde265.so.${LIBde265_VERSION}
 lib/pkgconfig/libde265.pc
@@ -1,10 +1,3 @@
@conflict libde265-1.0.5
-@bin bin/acceleration_speed
-@bin bin/bjoentegaard
-@bin bin/block-rate-estim
@bin bin/dec265
-@bin bin/gen-enc-table
-@bin bin/rd-curves
@bin bin/sherlock265
-@comment @bin bin/tests
-@bin bin/yuv-distortion