summaryrefslogtreecommitdiff
path: root/multimedia/libde265
diff options
context:
space:
mode:
Diffstat (limited to 'multimedia/libde265')
-rw-r--r--multimedia/libde265/Makefile26
-rw-r--r--multimedia/libde265/distinfo6
-rw-r--r--multimedia/libde265/files/patch-configure.ac43
-rw-r--r--multimedia/libde265/files/patch-disable-tools41
-rw-r--r--multimedia/libde265/files/patch-libde265_configparam.h71
-rw-r--r--multimedia/libde265/files/patch-libde265_encoder_Makefile.am21
-rw-r--r--multimedia/libde265/files/patch-libde265_encoder_algo_Makefile.am16
-rw-r--r--multimedia/libde265/files/patch-libde265_image-io.cc29
-rw-r--r--multimedia/libde265/files/patch-libde265_image-io.h106
-rw-r--r--multimedia/libde265/files/patch-libde265_quality.h25
-rw-r--r--multimedia/libde265/files/patch-only-export-decoder-api285
-rw-r--r--multimedia/libde265/pkg-plist8
12 files changed, 339 insertions, 338 deletions
diff --git a/multimedia/libde265/Makefile b/multimedia/libde265/Makefile
index 40c856ec61f3..a93c8abfc2ad 100644
--- a/multimedia/libde265/Makefile
+++ b/multimedia/libde265/Makefile
@@ -1,5 +1,5 @@
PORTNAME= libde265
-DISTVERSION= 1.0.12
+DISTVERSION= 1.0.16
CATEGORIES= multimedia
MASTER_SITES= https://github.com/strukturag/${PORTNAME}/releases/download/v${DISTVERSION}/
@@ -11,24 +11,34 @@ LICENSE= LGPL3
LICENSE_FILE= ${WRKSRC}/COPYING
USES= autoreconf compiler:c++11-lib cpe libtool pathfix pkgconfig
-GNU_CONFIGURE= yes
-USE_LDCONFIG= yes
-
CPE_VENDOR= struktur
+USE_LDCONFIG= yes
+GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-static --disable-sherlock265
+INSTALL_TARGET= install-strip
+
+OPTIONS_DEFINE= SDL
+OPTIONS_DEFAULT= SDL
+SDL_USES= sdl
+SDL_USE= SDL=sdl2
+SDL_CONFIGURE_ENABLE= sdl2
+
+_BIN= bjoentegaard block-rate-estim dec265 gen-enc-table rd-curves tests \
+ yuv-distortion
.include <bsd.port.pre.mk>
-.if ${ARCH} == "armv6" || ${ARCH} == "armv7"
+.if ${ARCH:Marmv?}
BUILD_DEPENDS+= ${LOCALBASE}/bin/as:devel/binutils
CONFIGURE_ENV+= CCASFLAGS="${CFLAGS} -B${LOCALBASE}/bin -no-integrated-as"
LLD_UNSAFE= yes
.endif
post-install:
- ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libde265.so.0.1.5
- ${MV} ${STAGEDIR}${PREFIX}/bin/dec265 \
- ${STAGEDIR}${PREFIX}/bin/libde265-dec265
+.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 6e9d2539ace5..afe9d7485913 100644
--- a/multimedia/libde265/distinfo
+++ b/multimedia/libde265/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1686766462
-SHA256 (libde265-1.0.12.tar.gz) = 62185ea2182e68cf68bba20cc6eb4c287407b509cf0a827d7ddb75614db77b5c
-SIZE (libde265-1.0.12.tar.gz) = 846345
+TIMESTAMP = 1760360000
+SHA256 (libde265-1.0.16.tar.gz) = b92beb6b53c346db9a8fae968d686ab706240099cdd5aff87777362d668b0de7
+SIZE (libde265-1.0.16.tar.gz) = 835657
diff --git a/multimedia/libde265/files/patch-configure.ac b/multimedia/libde265/files/patch-configure.ac
new file mode 100644
index 000000000000..37230a8efba6
--- /dev/null
+++ b/multimedia/libde265/files/patch-configure.ac
@@ -0,0 +1,43 @@
+--- 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-disable-tools b/multimedia/libde265/files/patch-disable-tools
deleted file mode 100644
index dfc6858e34dd..000000000000
--- a/multimedia/libde265/files/patch-disable-tools
+++ /dev/null
@@ -1,41 +0,0 @@
-Description: Disable building of some internal tools that no longer link
- because internal symbols are no longer exported.
-Author: Joachim Bauch <bauch@struktur.de>
---- dec265/Makefile.am
-+++ dec265/Makefile.am
-@@ -1,5 +1,5 @@
-
--bin_PROGRAMS = dec265 hdrcopy
-+bin_PROGRAMS = dec265
-
- AM_CPPFLAGS = -I$(top_srcdir)/libde265 -I$(top_srcdir)
-
-@@ -9,12 +9,6 @@
- dec265_LDADD = ../libde265/libde265.la -lstdc++
- dec265_SOURCES = dec265.cc
-
--hdrcopy_DEPENDENCIES = ../libde265/libde265.la
--hdrcopy_CXXFLAGS =
--hdrcopy_LDFLAGS =
--hdrcopy_LDADD = ../libde265/libde265.la -lstdc++
--hdrcopy_SOURCES = hdrcopy.cc
--
- if HAVE_VIDEOGFX
- dec265_CXXFLAGS += $(VIDEOGFX_CFLAGS)
- dec265_LDFLAGS += $(VIDEOGFX_LIBS)
---- Makefile.am
-+++ Makefile.am
-@@ -8,13 +8,6 @@
- SUBDIRS+=dec265
- endif
-
--if ENABLE_ENCODER
--SUBDIRS+=enc265
--endif
--
--SUBDIRS+=tools
--SUBDIRS+=acceleration-speed
--
- if ENABLE_SHERLOCK265
- SUBDIRS+=sherlock265
- endif
diff --git a/multimedia/libde265/files/patch-libde265_configparam.h b/multimedia/libde265/files/patch-libde265_configparam.h
new file mode 100644
index 000000000000..5cec21263be6
--- /dev/null
+++ b/multimedia/libde265/files/patch-libde265_configparam.h
@@ -0,0 +1,71 @@
+--- 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
new file mode 100644
index 000000000000..ee7f62e7c4d6
--- /dev/null
+++ b/multimedia/libde265/files/patch-libde265_encoder_Makefile.am
@@ -0,0 +1,21 @@
+--- 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
new file mode 100644
index 000000000000..d0d1f98c6c12
--- /dev/null
+++ b/multimedia/libde265/files/patch-libde265_encoder_algo_Makefile.am
@@ -0,0 +1,16 @@
+--- 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
new file mode 100644
index 000000000000..aad74d883d3c
--- /dev/null
+++ b/multimedia/libde265/files/patch-libde265_image-io.cc
@@ -0,0 +1,29 @@
+--- libde265/image-io.cc.orig 2025-04-26 20:58:45 UTC
++++ libde265/image-io.cc
+@@ -208,7 +208,7 @@ PacketSink_File::PacketSink_File()
+ }
+
+
+-LIBDE265_API PacketSink_File::~PacketSink_File()
++PacketSink_File::~PacketSink_File()
+ {
+ if (mFH) {
+ fclose(mFH);
+@@ -216,7 +216,7 @@ LIBDE265_API PacketSink_File::~PacketSink_File()
+ }
+
+
+-LIBDE265_API void PacketSink_File::set_filename(const char* filename)
++void PacketSink_File::set_filename(const char* filename)
+ {
+ assert(mFH==NULL);
+
+@@ -224,7 +224,7 @@ LIBDE265_API void PacketSink_File::set_filename(const
+ }
+
+
+-LIBDE265_API void PacketSink_File::send_packet(const uint8_t* data, int n)
++void PacketSink_File::send_packet(const uint8_t* data, int n)
+ {
+ uint8_t startCode[3];
+ startCode[0] = 0;
diff --git a/multimedia/libde265/files/patch-libde265_image-io.h b/multimedia/libde265/files/patch-libde265_image-io.h
new file mode 100644
index 000000000000..2fd2b78886fc
--- /dev/null
+++ b/multimedia/libde265/files/patch-libde265_image-io.h
@@ -0,0 +1,106 @@
+--- libde265/image-io.h.orig 2025-04-26 20:58:45 UTC
++++ libde265/image-io.h
+@@ -30,17 +30,17 @@ class ImageSource
+ class ImageSource
+ {
+ public:
+- LIBDE265_API ImageSource();
+- virtual LIBDE265_API ~ImageSource();
++ ImageSource();
++ virtual ~ImageSource();
+
+ //enum ImageStatus { Available, Waiting, EndOfVideo };
+
+ //virtual ImageStatus get_status() = 0;
+- virtual LIBDE265_API de265_image* get_image(bool block=true) = 0;
+- virtual LIBDE265_API void skip_frames(int n) = 0;
++ virtual de265_image* get_image(bool block=true) = 0;
++ virtual void skip_frames(int n) = 0;
+
+- virtual LIBDE265_API int get_width() const = 0;
+- virtual LIBDE265_API int get_height() const = 0;
++ virtual int get_width() const = 0;
++ virtual int get_height() const = 0;
+ };
+
+
+@@ -48,17 +48,17 @@ class ImageSource_YUV : public ImageSource
+ class ImageSource_YUV : public ImageSource
+ {
+ public:
+- LIBDE265_API ImageSource_YUV();
+- virtual LIBDE265_API ~ImageSource_YUV();
++ ImageSource_YUV();
++ virtual ~ImageSource_YUV();
+
+- bool LIBDE265_API set_input_file(const char* filename, int w,int h);
++ bool set_input_file(const char* filename, int w,int h);
+
+ //virtual ImageStatus get_status();
+- virtual LIBDE265_API de265_image* get_image(bool block=true);
+- virtual LIBDE265_API void skip_frames(int n);
++ virtual de265_image* get_image(bool block=true);
++ virtual void skip_frames(int n);
+
+- virtual LIBDE265_API int get_width() const;
+- virtual LIBDE265_API int get_height() const;
++ virtual int get_width() const;
++ virtual int get_height() const;
+
+ private:
+ FILE* mFH;
+@@ -74,20 +74,20 @@ class ImageSink
+ class ImageSink
+ {
+ public:
+- virtual LIBDE265_API ~ImageSink();
++ virtual ~ImageSink();
+
+- virtual LIBDE265_API void send_image(const de265_image* img) = 0;
++ virtual void send_image(const de265_image* img) = 0;
+ };
+
+ class ImageSink_YUV : public ImageSink
+ {
+ public:
+- LIBDE265_API ImageSink_YUV();
+- LIBDE265_API ~ImageSink_YUV();
++ ImageSink_YUV();
++ ~ImageSink_YUV();
+
+- bool LIBDE265_API set_filename(const char* filename);
++ bool set_filename(const char* filename);
+
+- virtual LIBDE265_API void send_image(const de265_image* img);
++ virtual void send_image(const de265_image* img);
+
+ private:
+ FILE* mFH;
+@@ -98,21 +98,21 @@ class PacketSink
+ class PacketSink
+ {
+ public:
+- virtual LIBDE265_API ~PacketSink();
++ virtual ~PacketSink();
+
+- virtual LIBDE265_API void send_packet(const uint8_t* data, int n) = 0;
++ virtual void send_packet(const uint8_t* data, int n) = 0;
+ };
+
+
+ class PacketSink_File : public PacketSink
+ {
+ public:
+- LIBDE265_API PacketSink_File();
+- virtual LIBDE265_API ~PacketSink_File();
++ PacketSink_File();
++ virtual ~PacketSink_File();
+
+- LIBDE265_API void set_filename(const char* filename);
++ void set_filename(const char* filename);
+
+- virtual LIBDE265_API void send_packet(const uint8_t* data, int n);
++ virtual void send_packet(const uint8_t* data, int n);
+
+ private:
+ FILE* mFH;
diff --git a/multimedia/libde265/files/patch-libde265_quality.h b/multimedia/libde265/files/patch-libde265_quality.h
new file mode 100644
index 000000000000..e05b58fa67e3
--- /dev/null
+++ b/multimedia/libde265/files/patch-libde265_quality.h
@@ -0,0 +1,25 @@
+--- libde265/quality.h.orig 2025-02-11 06:25:30 UTC
++++ libde265/quality.h
+@@ -26,11 +26,11 @@
+ #include <libde265/image.h>
+
+
+-LIBDE265_API uint32_t SSD(const uint8_t* img, int imgStride,
++uint32_t SSD(const uint8_t* img, int imgStride,
+ const uint8_t* ref, int refStride,
+ int width, int height);
+
+-LIBDE265_API uint32_t SAD(const uint8_t* img, int imgStride,
++uint32_t SAD(const uint8_t* img, int imgStride,
+ const uint8_t* ref, int refStride,
+ int width, int height);
+
+@@ -41,7 +41,7 @@ LIBDE265_API double PSNR(double mse);
+ LIBDE265_API double PSNR(double mse);
+
+
+-LIBDE265_API uint32_t compute_distortion_ssd(const de265_image* img1, const de265_image* img2,
++uint32_t compute_distortion_ssd(const de265_image* img1, const de265_image* img2,
+ int x0, int y0, int log2size, int cIdx);
+
+ #endif
diff --git a/multimedia/libde265/files/patch-only-export-decoder-api b/multimedia/libde265/files/patch-only-export-decoder-api
deleted file mode 100644
index 65d395b38560..000000000000
--- a/multimedia/libde265/files/patch-only-export-decoder-api
+++ /dev/null
@@ -1,285 +0,0 @@
-Description: Only export symbols defined in the decoder API.
- The encoder API is not final yet, so upstream exports all symbols to make
- development easier. For packaging we only want to expose the public API.
-Author: Joachim Bauch <bauch@struktur.de>
---- libde265/encoder/Makefile.am
-+++ libde265/encoder/Makefile.am
-@@ -12,6 +12,18 @@
- 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
-
---- libde265/encoder/algo/Makefile.am
-+++ libde265/encoder/algo/Makefile.am
-@@ -17,5 +17,13 @@
- 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
---- configure.ac
-+++ configure.ac
-@@ -56,9 +56,7 @@
- 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.
---- libde265/image-io.cc
-+++ libde265/image-io.cc
-@@ -186,7 +186,7 @@
- }
-
-
--LIBDE265_API PacketSink_File::~PacketSink_File()
-+PacketSink_File::~PacketSink_File()
- {
- if (mFH) {
- fclose(mFH);
-@@ -194,7 +194,7 @@
- }
-
-
--LIBDE265_API void PacketSink_File::set_filename(const char* filename)
-+void PacketSink_File::set_filename(const char* filename)
- {
- assert(mFH==NULL);
-
-@@ -202,7 +202,7 @@
- }
-
-
--LIBDE265_API void PacketSink_File::send_packet(const uint8_t* data, int n)
-+void PacketSink_File::send_packet(const uint8_t* data, int n)
- {
- uint8_t startCode[3];
- startCode[0] = 0;
---- libde265/image-io.h
-+++ libde265/image-io.h
-@@ -30,17 +30,17 @@
- class ImageSource
- {
- public:
-- LIBDE265_API ImageSource();
-- virtual LIBDE265_API ~ImageSource() { }
-+ ImageSource();
-+ virtual ~ImageSource() { }
-
- //enum ImageStatus { Available, Waiting, EndOfVideo };
-
- //virtual ImageStatus get_status() = 0;
-- virtual LIBDE265_API de265_image* get_image(bool block=true) = 0;
-- virtual LIBDE265_API void skip_frames(int n) = 0;
-+ virtual de265_image* get_image(bool block=true) = 0;
-+ virtual void skip_frames(int n) = 0;
-
-- virtual LIBDE265_API int get_width() const = 0;
-- virtual LIBDE265_API int get_height() const = 0;
-+ virtual int get_width() const = 0;
-+ virtual int get_height() const = 0;
- };
-
-
-@@ -48,17 +48,17 @@
- class ImageSource_YUV : public ImageSource
- {
- public:
-- LIBDE265_API ImageSource_YUV();
-- virtual LIBDE265_API ~ImageSource_YUV();
-+ ImageSource_YUV();
-+ virtual ~ImageSource_YUV();
-
-- bool LIBDE265_API set_input_file(const char* filename, int w,int h);
-+ bool set_input_file(const char* filename, int w,int h);
-
- //virtual ImageStatus get_status();
-- virtual LIBDE265_API de265_image* get_image(bool block=true);
-- virtual LIBDE265_API void skip_frames(int n);
-+ virtual de265_image* get_image(bool block=true);
-+ virtual void skip_frames(int n);
-
-- virtual LIBDE265_API int get_width() const { return width; }
-- virtual LIBDE265_API int get_height() const { return height; }
-+ virtual int get_width() const { return width; }
-+ virtual int get_height() const { return height; }
-
- private:
- FILE* mFH;
-@@ -74,20 +74,20 @@
- class ImageSink
- {
- public:
-- virtual LIBDE265_API ~ImageSink() { }
-+ virtual ~ImageSink() { }
-
-- virtual LIBDE265_API void send_image(const de265_image* img) = 0;
-+ virtual void send_image(const de265_image* img) = 0;
- };
-
- class ImageSink_YUV : public ImageSink
- {
- public:
-- LIBDE265_API ImageSink_YUV() : mFH(NULL) { }
-- LIBDE265_API ~ImageSink_YUV();
-+ ImageSink_YUV() : mFH(NULL) { }
-+ ~ImageSink_YUV();
-
-- bool LIBDE265_API set_filename(const char* filename);
-+ bool set_filename(const char* filename);
-
-- virtual LIBDE265_API void send_image(const de265_image* img);
-+ virtual void send_image(const de265_image* img);
-
- private:
- FILE* mFH;
-@@ -98,21 +98,21 @@
- class PacketSink
- {
- public:
-- virtual LIBDE265_API ~PacketSink() { }
-+ virtual ~PacketSink() { }
-
-- virtual LIBDE265_API void send_packet(const uint8_t* data, int n) = 0;
-+ virtual void send_packet(const uint8_t* data, int n) = 0;
- };
-
-
- class PacketSink_File : public PacketSink
- {
- public:
-- LIBDE265_API PacketSink_File();
-- virtual LIBDE265_API ~PacketSink_File();
-+ PacketSink_File();
-+ virtual ~PacketSink_File();
-
-- LIBDE265_API void set_filename(const char* filename);
-+ void set_filename(const char* filename);
-
-- virtual LIBDE265_API void send_packet(const uint8_t* data, int n);
-+ virtual void send_packet(const uint8_t* data, int n);
-
- private:
- FILE* mFH;
---- libde265/configparam.h
-+++ libde265/configparam.h
-@@ -95,7 +95,7 @@
- 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 @@
- 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 @@
- 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 @@
- 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 @@
- 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 @@
- 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);
-
-
---- libde265/quality.h
-+++ libde265/quality.h
-@@ -26,11 +26,11 @@
- #include <libde265/image.h>
-
-
--LIBDE265_API uint32_t SSD(const uint8_t* img, int imgStride,
-+uint32_t SSD(const uint8_t* img, int imgStride,
- const uint8_t* ref, int refStride,
- int width, int height);
-
--LIBDE265_API uint32_t SAD(const uint8_t* img, int imgStride,
-+uint32_t SAD(const uint8_t* img, int imgStride,
- const uint8_t* ref, int refStride,
- int width, int height);
-
-@@ -41,7 +41,7 @@
- LIBDE265_API double PSNR(double mse);
-
-
--LIBDE265_API uint32_t compute_distortion_ssd(const de265_image* img1, const de265_image* img2,
-+uint32_t compute_distortion_ssd(const de265_image* img1, const de265_image* img2,
- int x0, int y0, int log2size, int cIdx);
-
- #endif
diff --git a/multimedia/libde265/pkg-plist b/multimedia/libde265/pkg-plist
index 26745369d393..53005aa07642 100644
--- a/multimedia/libde265/pkg-plist
+++ b/multimedia/libde265/pkg-plist
@@ -1,7 +1,13 @@
+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/libde265.so
lib/libde265.so.0
-lib/libde265.so.0.1.5
+lib/libde265.so.0.1.9
libdata/pkgconfig/libde265.pc