Here is an update to libde265 1.0.15.
CVE-2020-21594-CVE-2020-21606, CVE-2022-1253, CVE-2022-43236-CVE-2022-43253,
CVE-2022-47655, CVE-2023-27102l, CVE-2023-27103, CVE-2023-49465, CVE-2023-49467,
CVE-2023-49468
Index: Makefile
===================================================================
RCS file: /cvs/ports/multimedia/libde265/Makefile,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 Makefile
--- Makefile 27 Sep 2023 10:10:20 -0000 1.11
+++ Makefile 8 Mar 2024 07:01:03 -0000
@@ -1,14 +1,12 @@
COMMENT-main= open H.265 video codec implementation
COMMENT-tools= tools for libde265 open H.265 video codec
-V= 1.0.8
+V= 1.0.15
DISTNAME= libde265-$V
PKGNAME-main= ${DISTNAME}
PKGNAME-tools= libde265-tools-$V
-REVISION-tools= 0
-
-SHARED_LIBS += de265 1.0 # 0.12
+SHARED_LIBS += de265 2.0 # 0.12
CATEGORIES= multimedia
@@ -20,13 +18,14 @@ PERMIT_PACKAGE= Yes
WANTLIB += ${COMPILER_LIBCXX} m
WANTLIB-tools += ${WANTLIB}
-WANTLIB-tools += GL Qt5Core Qt5Gui Qt5Widgets SDL X11 X11-xcb Xau
-WANTLIB-tools += Xdmcp Xext Xfixes Xxf86vm avutil c de265 double-conversion
-WANTLIB-tools += drm execinfo expat freetype glapi glib-2.0 graphite2
-WANTLIB-tools += gthread-2.0 harfbuzz iconv icudata icui18n icuuc
-WANTLIB-tools += intl pcre2-8 pcre2-16 png sndio swscale usbhid xcb xcb-dri2
-WANTLIB-tools += xcb-dri3 xcb-glx xcb-present xcb-sync xcb-xfixes xshmfence
-WANTLIB-tools += z zstd xcb-shm
+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
MULTI_PACKAGES= -main -tools
@@ -42,7 +41,7 @@ LIB_DEPENDS-main= ${LIB_DEPENDS}
LIB_DEPENDS-tools= ${LIB_DEPENDS} \
multimedia/libde265,-main \
- devel/sdl \
+ devel/sdl2 \
graphics/ffmpeg \
x11/qt5/qtbase
Index: distinfo
===================================================================
RCS file: /cvs/ports/multimedia/libde265/distinfo,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 distinfo
--- distinfo 6 May 2022 05:38:46 -0000 1.3
+++ distinfo 8 Mar 2024 07:01:03 -0000
@@ -1,2 +1,2 @@
-SHA256 (libde265-1.0.8.tar.gz) = JMeR3TNPpSF2IyD/VPD+v9PAn8l4iAqMX7xAqI8h2QU=
-SIZE (libde265-1.0.8.tar.gz) = 837878
+SHA256 (libde265-1.0.15.tar.gz) = ACUZhsKdNNOvcRftBYdJUMh13ZKS0Ba+KdOzdiZmUR0=
+SIZE (libde265-1.0.15.tar.gz) = 846016
Index: patches/patch-acceleration-speed_Makefile_in
===================================================================
RCS file:
/cvs/ports/multimedia/libde265/patches/patch-acceleration-speed_Makefile_in,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-acceleration-speed_Makefile_in
--- patches/patch-acceleration-speed_Makefile_in 11 Mar 2022 19:39:20
-0000 1.2
+++ patches/patch-acceleration-speed_Makefile_in 8 Mar 2024 07:01:03
-0000
@@ -1,7 +1,7 @@
Index: acceleration-speed/Makefile.in
--- acceleration-speed/Makefile.in.orig
+++ acceleration-speed/Makefile.in
-@@ -358,7 +358,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/libde265 -I$(top_srcdir)
+@@ -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 =
Index: patches/patch-dec265_Makefile_in
===================================================================
RCS file: /cvs/ports/multimedia/libde265/patches/patch-dec265_Makefile_in,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-dec265_Makefile_in
--- patches/patch-dec265_Makefile_in 11 Mar 2022 19:39:20 -0000 1.2
+++ patches/patch-dec265_Makefile_in 8 Mar 2024 07:01:03 -0000
@@ -1,18 +1,12 @@
Index: dec265/Makefile.in
--- dec265/Makefile.in.orig
+++ dec265/Makefile.in
-@@ -361,12 +361,12 @@ AM_CPPFLAGS = -I$(top_srcdir)/libde265 -I$(top_srcdir)
+@@ -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)
- hdrcopy_DEPENDENCIES = ../libde265/libde265.la
- hdrcopy_CXXFLAGS =
- hdrcopy_LDFLAGS =
--hdrcopy_LDADD = ../libde265/libde265.la -lstdc++
-+hdrcopy_LDADD = ../libde265/libde265.la
- hdrcopy_SOURCES = hdrcopy.cc
EXTRA_DIST = Makefile.vc7 \
CMakeLists.txt \
Index: patches/patch-enc265_Makefile_in
===================================================================
RCS file: /cvs/ports/multimedia/libde265/patches/patch-enc265_Makefile_in,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-enc265_Makefile_in
--- patches/patch-enc265_Makefile_in 11 Mar 2022 19:39:20 -0000 1.2
+++ patches/patch-enc265_Makefile_in 8 Mar 2024 07:01:03 -0000
@@ -1,7 +1,7 @@
Index: enc265/Makefile.in
--- enc265/Makefile.in.orig
+++ enc265/Makefile.in
-@@ -351,7 +351,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/libde265 -I$(top_srcdir)
+@@ -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)
Index: patches/patch-libde265_pc_in
===================================================================
RCS file: /cvs/ports/multimedia/libde265/patches/patch-libde265_pc_in,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-libde265_pc_in
--- patches/patch-libde265_pc_in 11 Mar 2022 19:39:20 -0000 1.2
+++ patches/patch-libde265_pc_in 8 Mar 2024 07:01:03 -0000
@@ -3,8 +3,8 @@ Index: libde265.pc.in
+++ libde265.pc.in
@@ -9,5 +9,5 @@ URL: https://github.com/strukturag/libde265
Version: @VERSION@
- Requires:
- Libs: -lde265 -L@libdir@
--Libs.private: @LIBS@ -lstdc++
-+Libs.private: @LIBS@
- Cflags: -I@includedir@
+ Requires:
+ Libs: -lde265 -L${libdir}
+-Libs.private: @LIBS_PRIVATE@
++Libs.private: -lpthread -lm
+ Cflags: -I${includedir}
Index: patches/patch-sherlock265_Makefile_in
===================================================================
RCS file: /cvs/ports/multimedia/libde265/patches/patch-sherlock265_Makefile_in,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-sherlock265_Makefile_in
--- patches/patch-sherlock265_Makefile_in 11 Mar 2022 19:39:20 -0000
1.2
+++ patches/patch-sherlock265_Makefile_in 8 Mar 2024 07:01:03 -0000
@@ -1,7 +1,7 @@
Index: sherlock265/Makefile.in
--- sherlock265/Makefile.in.orig
+++ sherlock265/Makefile.in
-@@ -361,7 +361,7 @@ sherlock265_DEPENDENCIES = ../libde265/libde265.la
+@@ -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)
Index: patches/patch-tools_Makefile_in
===================================================================
RCS file: /cvs/ports/multimedia/libde265/patches/patch-tools_Makefile_in,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-tools_Makefile_in
--- patches/patch-tools_Makefile_in 11 Mar 2022 19:39:20 -0000 1.2
+++ patches/patch-tools_Makefile_in 8 Mar 2024 07:01:03 -0000
@@ -1,7 +1,7 @@
Index: tools/Makefile.in
--- tools/Makefile.in.orig
+++ tools/Makefile.in
-@@ -367,32 +367,32 @@ AM_CPPFLAGS = -I$(top_srcdir)/libde265 -I$(top_srcdir)
+@@ -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 =
Index: pkg/PLIST-tools
===================================================================
RCS file: /cvs/ports/multimedia/libde265/pkg/PLIST-tools,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 PLIST-tools
--- pkg/PLIST-tools 11 Mar 2022 19:39:20 -0000 1.2
+++ pkg/PLIST-tools 8 Mar 2024 07:01:03 -0000
@@ -3,9 +3,7 @@
@bin bin/bjoentegaard
@bin bin/block-rate-estim
@bin bin/dec265
-@bin bin/enc265
@bin bin/gen-enc-table
-@bin bin/hdrcopy
@bin bin/rd-curves
@bin bin/sherlock265
@comment @bin bin/tests
