Date: Wed, 20 May 2026 06:00:05 +0000 From: Xin LI <delphij@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 54c66caafac7 - main - multimedia/libde265: Update to 1.0.19, switch to cmake Message-ID: <6a0d4de5.32088.fca87@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by delphij: URL: https://cgit.FreeBSD.org/ports/commit/?id=54c66caafac728e4c599ac182f0198ae9d5c7bfc commit 54c66caafac728e4c599ac182f0198ae9d5c7bfc Author: Xin LI <delphij@FreeBSD.org> AuthorDate: 2026-05-20 03:05:56 +0000 Commit: Xin LI <delphij@FreeBSD.org> CommitDate: 2026-05-20 05:53:30 +0000 multimedia/libde265: Update to 1.0.19, switch to cmake --- multimedia/libde265/Makefile | 25 +++----- multimedia/libde265/distinfo | 6 +- multimedia/libde265/files/patch-configure.ac | 43 ------------- .../libde265/files/patch-libde265_configparam.h | 71 ---------------------- .../files/patch-libde265_encoder_Makefile.am | 21 ------- .../files/patch-libde265_encoder_algo_Makefile.am | 16 ----- .../libde265/files/patch-libde265_image-io.cc | 4 +- multimedia/libde265/pkg-plist | 11 ++-- 8 files changed, 19 insertions(+), 178 deletions(-) diff --git a/multimedia/libde265/Makefile b/multimedia/libde265/Makefile index a93c8abfc2ad..bf5d8e0ae260 100644 --- a/multimedia/libde265/Makefile +++ b/multimedia/libde265/Makefile @@ -1,5 +1,5 @@ PORTNAME= libde265 -DISTVERSION= 1.0.16 +DISTVERSION= 1.0.19 CATEGORIES= multimedia MASTER_SITES= https://github.com/strukturag/${PORTNAME}/releases/download/v${DISTVERSION}/ @@ -10,35 +10,30 @@ WWW= https://www.libde265.org LICENSE= LGPL3 LICENSE_FILE= ${WRKSRC}/COPYING -USES= autoreconf compiler:c++11-lib cpe libtool pathfix pkgconfig +USES= cmake compiler:c++11-lib cpe pkgconfig CPE_VENDOR= struktur USE_LDCONFIG= yes -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --disable-static --disable-sherlock265 -INSTALL_TARGET= install-strip +CMAKE_ARGS= -DBUILD_SHARED_LIBS:BOOL=ON \ + -DENABLE_ENCODER:BOOL=OFF \ + -DENABLE_INTERNAL_DEVELOPMENT_TOOLS:BOOL=OFF OPTIONS_DEFINE= SDL OPTIONS_DEFAULT= SDL SDL_USES= sdl SDL_USE= SDL=sdl2 -SDL_CONFIGURE_ENABLE= sdl2 +SDL_CMAKE_BOOL= ENABLE_SDL -_BIN= bjoentegaard block-rate-estim dec265 gen-enc-table rd-curves tests \ - yuv-distortion +post-install: + ${MV} ${STAGEDIR}${PREFIX}/bin/dec265 \ + ${STAGEDIR}${PREFIX}/bin/libde265-dec265 .include <bsd.port.pre.mk> .if ${ARCH:Marmv?} BUILD_DEPENDS+= ${LOCALBASE}/bin/as:devel/binutils -CONFIGURE_ENV+= CCASFLAGS="${CFLAGS} -B${LOCALBASE}/bin -no-integrated-as" +CMAKE_ARGS+= -DCMAKE_ASM_FLAGS="${CFLAGS} -B${LOCALBASE}/bin -no-integrated-as" LLD_UNSAFE= yes .endif -post-install: -.for F in ${_BIN} - ${MV} ${STAGEDIR}${PREFIX}/bin/${F} \ - ${STAGEDIR}${PREFIX}/bin/libde265-${F} -.endfor - .include <bsd.port.post.mk> diff --git a/multimedia/libde265/distinfo b/multimedia/libde265/distinfo index afe9d7485913..88565a2dbcd5 100644 --- a/multimedia/libde265/distinfo +++ b/multimedia/libde265/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1760360000 -SHA256 (libde265-1.0.16.tar.gz) = b92beb6b53c346db9a8fae968d686ab706240099cdd5aff87777362d668b0de7 -SIZE (libde265-1.0.16.tar.gz) = 835657 +TIMESTAMP = 1779254167 +SHA256 (libde265-1.0.19.tar.gz) = bb19a0b485d2643e0eeb7e91f3ab32d1ad617e7c487dbedc91214ca3dbd8d7eb +SIZE (libde265-1.0.19.tar.gz) = 291375 diff --git a/multimedia/libde265/files/patch-configure.ac b/multimedia/libde265/files/patch-configure.ac deleted file mode 100644 index 37230a8efba6..000000000000 --- a/multimedia/libde265/files/patch-configure.ac +++ /dev/null @@ -1,43 +0,0 @@ ---- configure.ac.orig 2025-05-03 22:03:20 UTC -+++ configure.ac -@@ -56,9 +56,7 @@ changequote([,])dnl - fi - changequote([,])dnl - --dnl gl_VISIBILITY --dnl : In encoder branch, we still export all library symbols : --HAVE_VISIBILITY=0 -+gl_VISIBILITY - AM_CONDITIONAL([HAVE_VISIBILITY], [test "x$HAVE_VISIBILITY" != "x0"]) - - # Checks for header files. -@@ -294,9 +292,11 @@ fi - - # --- enable example programs --- - -+AC_ARG_ENABLE([sdl2], AS_HELP_STRING([--disable-sdl2], [Do not use SDL2.])) - AC_ARG_ENABLE([dec265], AS_HELP_STRING([--disable-dec265], [Do not build dec265 decoder program.])) - AC_ARG_ENABLE([sherlock265], AS_HELP_STRING([--disable-sherlock265], [Do not build sherlock265 visual inspection program.])) - -+if eval "test x$enable_sdl2 = x" ; then enable_sdl2=yes ; fi - if eval "test x$enable_dec265 = x" ; then enable_dec265=yes ; fi - if eval "test x$enable_sherlock265 = x" ; then enable_sherlock265=yes ; fi - -@@ -310,7 +310,7 @@ fi - ) - fi - --if eval "test x$enable_dec265 = xyes" ; then -+if eval "test x$enable_dec265 = xyes" && eval "test x$enable_sdl2 = xyes" ; then - PKG_CHECK_MODULES([SDL], [sdl2], - [AC_DEFINE([HAVE_SDL], [1], [Whether libsdl2 was found.]) - AC_SUBST(SDL_CFLAGS) -@@ -334,7 +334,7 @@ AM_CONDITIONAL([HAVE_SDL], [test "x$have_sdl" = "xyes" - AM_CONDITIONAL([HAVE_SWSCALE], [test "x$have_swscale" = "xyes"]) - AM_CONDITIONAL([HAVE_SDL], [test "x$have_sdl" = "xyes"]) - --if eval "test $enable_dec265 = yes" && eval "test $have_videogfx != yes" && eval "test $have_sdl != yes" ; then -+if eval "test $enable_dec265 = yes" && eval "test $have_videogfx != yes" && eval "test x$have_sdl != xyes" ; then - AC_MSG_WARN([Did not find libvideogfx or libsdl2, video output of dec265 will be disabled.]) - fi - diff --git a/multimedia/libde265/files/patch-libde265_configparam.h b/multimedia/libde265/files/patch-libde265_configparam.h deleted file mode 100644 index 5cec21263be6..000000000000 --- a/multimedia/libde265/files/patch-libde265_configparam.h +++ /dev/null @@ -1,71 +0,0 @@ ---- libde265/configparam.h.orig 2025-04-26 19:56:15 UTC -+++ libde265/configparam.h -@@ -95,7 +95,7 @@ class option_base - bool hasLongOption() const { return true; } //mLongOption!=NULL; } - std::string getLongOption() const { return mLongOption ? std::string(mLongOption) : get_name(); } - -- virtual LIBDE265_API bool processCmdLineArguments(char** argv, int* argc, int idx) { return false; } -+ virtual bool processCmdLineArguments(char** argv, int* argc, int idx) { return false; } - - - -@@ -132,7 +132,7 @@ class option_bool : public option_base (public) - virtual std::string get_default_string() const { return default_value ? "true":"false"; } - - virtual std::string getTypeDescr() const { return "(boolean)"; } -- virtual LIBDE265_API bool processCmdLineArguments(char** argv, int* argc, int idx) { set(true); return true; } -+ virtual bool processCmdLineArguments(char** argv, int* argc, int idx) { set(true); return true; } - - bool set(bool v) { value_set=true; value=v; return true; } - -@@ -162,10 +162,10 @@ class option_string : public option_base (public) - virtual bool has_default() const { return default_set; } - - void set_default(std::string v) { default_value=v; default_set=true; } -- virtual LIBDE265_API std::string get_default_string() const { return default_value; } -+ virtual std::string get_default_string() const { return default_value; } - -- virtual LIBDE265_API std::string getTypeDescr() const { return "(string)"; } -- virtual LIBDE265_API bool processCmdLineArguments(char** argv, int* argc, int idx); -+ virtual std::string getTypeDescr() const { return "(string)"; } -+ virtual bool processCmdLineArguments(char** argv, int* argc, int idx); - - bool set(std::string v) { value_set=true; value=v; return true; } - -@@ -201,10 +201,10 @@ class option_int : public option_base (public) - virtual bool has_default() const { return default_set; } - - void set_default(int v) { default_value=v; default_set=true; } -- virtual LIBDE265_API std::string get_default_string() const; -+ virtual std::string get_default_string() const; - -- virtual LIBDE265_API std::string getTypeDescr() const; -- virtual LIBDE265_API bool processCmdLineArguments(char** argv, int* argc, int idx); -+ virtual std::string getTypeDescr() const; -+ virtual bool processCmdLineArguments(char** argv, int* argc, int idx); - - bool set(int v) { - if (is_valid(v)) { value_set=true; value=v; return true; } -@@ -239,7 +239,7 @@ class choice_option_base : public option_base (public) - virtual std::vector<std::string> get_choice_names() const = 0; - - virtual std::string getTypeDescr() const; -- virtual LIBDE265_API bool processCmdLineArguments(char** argv, int* argc, int idx); -+ virtual bool processCmdLineArguments(char** argv, int* argc, int idx); - - const char** get_choices_string_table() const; - -@@ -368,10 +368,10 @@ class config_parameters - config_parameters() : param_string_table(NULL) { } - ~config_parameters() { delete[] param_string_table; } - -- void LIBDE265_API add_option(option_base* o); -+ void add_option(option_base* o); - -- void LIBDE265_API print_params() const; -- bool LIBDE265_API parse_command_line_params(int* argc, char** argv, int* first_idx=NULL, -+ void print_params() const; -+ bool parse_command_line_params(int* argc, char** argv, int* first_idx=NULL, - bool ignore_unknown_options=false); - - diff --git a/multimedia/libde265/files/patch-libde265_encoder_Makefile.am b/multimedia/libde265/files/patch-libde265_encoder_Makefile.am deleted file mode 100644 index ee7f62e7c4d6..000000000000 --- a/multimedia/libde265/files/patch-libde265_encoder_Makefile.am +++ /dev/null @@ -1,21 +0,0 @@ ---- libde265/encoder/Makefile.am.orig 2025-10-13 13:20:07 UTC -+++ libde265/encoder/Makefile.am -@@ -12,6 +12,18 @@ libde265_encoder_la_SOURCES = \ - encpicbuf.h encpicbuf.cc \ - sop.h sop.cc - -+libde265_encoder_la_CFLAGS = \ -+ $(CFLAG_VISIBILITY) \ -+ -DLIBDE265_EXPORTS -+libde265_encoder_la_CXXFLAGS += \ -+ $(CFLAG_VISIBILITY) \ -+ -DLIBDE265_EXPORTS -+ -+if HAVE_VISIBILITY -+ libde265_encoder_la_CFLAGS += -DHAVE_VISIBILITY -+ libde265_encoder_la_CXXFLAGS += -DHAVE_VISIBILITY -+endif -+ - SUBDIRS=algo - libde265_encoder_la_LIBADD = algo/libde265_encoder_algo.la - diff --git a/multimedia/libde265/files/patch-libde265_encoder_algo_Makefile.am b/multimedia/libde265/files/patch-libde265_encoder_algo_Makefile.am deleted file mode 100644 index d0d1f98c6c12..000000000000 --- a/multimedia/libde265/files/patch-libde265_encoder_algo_Makefile.am +++ /dev/null @@ -1,16 +0,0 @@ ---- libde265/encoder/algo/Makefile.am.orig 2025-10-13 13:20:07 UTC -+++ libde265/encoder/algo/Makefile.am -@@ -17,5 +17,13 @@ libde265_encoder_algo_la_SOURCES = \ - tb-rateestim.h tb-rateestim.cc \ - pb-mv.h pb-mv.cc - -+libde265_encoder_algo_la_CXXFLAGS += \ -+ $(CFLAG_VISIBILITY) \ -+ -DLIBDE265_EXPORTS -+ -+if HAVE_VISIBILITY -+ libde265_encoder_algo_la_CXXFLAGS += -DHAVE_VISIBILITY -+endif -+ - EXTRA_DIST = \ - CMakeLists.txt diff --git a/multimedia/libde265/files/patch-libde265_image-io.cc b/multimedia/libde265/files/patch-libde265_image-io.cc index aad74d883d3c..a8a56a044d07 100644 --- a/multimedia/libde265/files/patch-libde265_image-io.cc +++ b/multimedia/libde265/files/patch-libde265_image-io.cc @@ -1,4 +1,4 @@ ---- libde265/image-io.cc.orig 2025-04-26 20:58:45 UTC +--- libde265/image-io.cc.orig 2026-05-19 05:53:49 UTC +++ libde265/image-io.cc @@ -208,7 +208,7 @@ PacketSink_File::PacketSink_File() } @@ -16,7 +16,7 @@ -LIBDE265_API void PacketSink_File::set_filename(const char* filename) +void PacketSink_File::set_filename(const char* filename) { - assert(mFH==NULL); + assert(mFH==nullptr); @@ -224,7 +224,7 @@ LIBDE265_API void PacketSink_File::set_filename(const } diff --git a/multimedia/libde265/pkg-plist b/multimedia/libde265/pkg-plist index 53005aa07642..a77bf092bbd6 100644 --- a/multimedia/libde265/pkg-plist +++ b/multimedia/libde265/pkg-plist @@ -1,13 +1,10 @@ -bin/libde265-bjoentegaard -bin/libde265-block-rate-estim bin/libde265-dec265 -bin/libde265-gen-enc-table -bin/libde265-rd-curves -bin/libde265-tests -bin/libde265-yuv-distortion include/libde265/de265-version.h include/libde265/de265.h +lib/cmake/libde265/libde265-config-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/libde265/libde265-config-version.cmake +lib/cmake/libde265/libde265-config.cmake lib/libde265.so lib/libde265.so.0 -lib/libde265.so.0.1.9 +lib/libde265.so.0.1.12 libdata/pkgconfig/libde265.pchome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6a0d4de5.32088.fca87>