View | Details | Raw Unified | Return to bug 251442 | Differences between
and this patch

Collapse All | Expand All

(-)b/multimedia/libde265/Makefile (-6 / +19 lines)
Lines 1-20 Link Here
1
# Created by: Koop Mast <kwm@FreeBSD.org>
1
# Created by: Koop Mast <kwm@FreeBSD.org>
2
2
3
PORTNAME=	libde265
3
PORTNAME=	libde265
4
PORTVERSION=	1.0.2
4
DISTVERSION=	1.0.8
5
PORTREVISION=	5
6
DISTVERSIONPREFIX=	v
7
CATEGORIES=	multimedia
5
CATEGORIES=	multimedia
6
MASTER_SITES=	https://github.com/strukturag/${PORTNAME}/releases/download/v${DISTVERSION}/
7
8
PATCH_SITES=	https://github.com/strukturag/${PORTNAME}/commit/
9
PATCHFILES=	900772c3e9ee1e106b93283fd8e7633d52899e40.patch:-p1 \
10
		7d5aeb5f11531de33f5b7ae0e768ffc50da4facb.patch:-p1 \
11
		dbff9077462899fc8e3b39907d43c2a6ad54e9f3.patch:-p1 \
12
		a3f1c6a0dea2b0d4a531255ad06ed40cdb184d25.patch:-p1 \
13
		4c0fe2c149c68ece57fde4cb11e05b5fb572da4b.patch:-p1
8
14
9
MAINTAINER=	kwm@FreeBSD.org
15
MAINTAINER=	kwm@FreeBSD.org
10
COMMENT=	Open source h.265 video codec
16
COMMENT=	Open source h.265 video codec
11
17
12
USE_GITHUB=	yes
18
LICENSE=	LGPL3
13
GH_ACCOUNT=	strukturag
19
LICENSE_FILE=	${WRKSRC}/COPYING
14
20
15
USES=		autoreconf compiler:c++11-lib libtool pathfix pkgconfig
21
USES=		autoreconf compiler:c++11-lib libtool pathfix pkgconfig
16
GNU_CONFIGURE=	yes
22
GNU_CONFIGURE=	yes
17
CONFIGURE_ARGS=	--disable-sherlock265 --disable-dec265
23
USE_LDCONFIG=	yes
24
25
CONFIGURE_ARGS=	--disable-static --disable-sherlock265
18
26
19
.include <bsd.port.pre.mk>
27
.include <bsd.port.pre.mk>
20
28
Lines 24-27 CONFIGURE_ENV+= CCASFLAGS="${CFLAGS} -B${LOCALBASE}/bin -no-integrated-as" Link Here
24
LLD_UNSAFE=	yes
32
LLD_UNSAFE=	yes
25
.endif
33
.endif
26
34
35
post-install:
36
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libde265.so.0.1.1
37
	${MV} ${STAGEDIR}${PREFIX}/bin/dec265 \
38
		${STAGEDIR}${PREFIX}/bin/libde265-dec265
39
27
.include <bsd.port.post.mk>
40
.include <bsd.port.post.mk>
(-)b/multimedia/libde265/distinfo (-2 / +13 lines)
Lines 1-2 Link Here
1
SHA256 (strukturag-libde265-v1.0.2_GH0.tar.gz) = c9769a621d568bf5d1e687453cb5d996d7a813476813edb4752ce0fea437fca8
1
TIMESTAMP = 1644223000
2
SIZE (strukturag-libde265-v1.0.2_GH0.tar.gz) = 381737
2
SHA256 (libde265-1.0.8.tar.gz) = 24c791dd334fa521762320ff54f0febfd3c09fc978880a8c5fbc40a88f21d905
3
SIZE (libde265-1.0.8.tar.gz) = 837878
4
SHA256 (900772c3e9ee1e106b93283fd8e7633d52899e40.patch) = 121750b44912f45c071b866f6183d7a17cd0e2e2734c69dfa18251ee83fee2db
5
SIZE (900772c3e9ee1e106b93283fd8e7633d52899e40.patch) = 871
6
SHA256 (7d5aeb5f11531de33f5b7ae0e768ffc50da4facb.patch) = 49dbd9d91071b2977753b60645b9465d395f4d9e28d304afb97331594d1befa8
7
SIZE (7d5aeb5f11531de33f5b7ae0e768ffc50da4facb.patch) = 2677
8
SHA256 (dbff9077462899fc8e3b39907d43c2a6ad54e9f3.patch) = 47e3cb0424963a9187dc8fa2944b195a9203da0218efd550683dda9be6884fca
9
SIZE (dbff9077462899fc8e3b39907d43c2a6ad54e9f3.patch) = 733
10
SHA256 (a3f1c6a0dea2b0d4a531255ad06ed40cdb184d25.patch) = e47243f811d9924aaea7c76043cebfe9254a32797b92fabd9526b5d8cd491264
11
SIZE (a3f1c6a0dea2b0d4a531255ad06ed40cdb184d25.patch) = 2348
12
SHA256 (4c0fe2c149c68ece57fde4cb11e05b5fb572da4b.patch) = da76d56fd0d5ab480c4e44a8d3bbd8adf17ebd5b6e77c1516dacf8f17edb9e2c
13
SIZE (4c0fe2c149c68ece57fde4cb11e05b5fb572da4b.patch) = 1709
(-)a/multimedia/libde265/files/patch-configure.ac (-60 lines)
Removed Link Here
1
--- configure.ac.orig	2015-07-14 13:51:51.000000000 +0200
2
+++ configure.ac	2015-07-22 16:42:42.854395000 +0200
3
@@ -36,8 +36,8 @@
4
 # Initialize automake stuff
5
 AM_INIT_AUTOMAKE
6
 
7
-CFLAGS+=" -std=c99"
8
-CXXFLAGS+=" -Werror=return-type -Werror=unused-result -Werror=reorder"
9
+CFLAGS="$CFLAGS -std=c99"
10
+CXXFLAGS="$CXXFLAGS -Werror=return-type -Werror=unused-result -Werror=reorder"
11
 AX_CXX_COMPILE_STDCXX_11()
12
 
13
 dnl Use -Wall if we have gcc.
14
@@ -101,8 +101,8 @@
15
 ],[],[need_strict_ansi=no],[need_strict_ansi=yes]);
16
 AC_LANG_POP(C++)
17
 if eval "test x$need_strict_ansi = xyes"; then
18
-  CFLAGS+=" -D__STRICT_ANSI__"
19
-  CXXFLAGS+=" -D__STRICT_ANSI__"
20
+  CFLAGS="$CFLAGS -D__STRICT_ANSI__"
21
+  CXXFLAGS="$CXXFLAGS -D__STRICT_ANSI__"
22
 fi
23
 AC_MSG_RESULT([$need_strict_ansi])
24
 
25
@@ -180,7 +180,7 @@
26
   [enable_log_error=$enableval],
27
   [enable_log_error=yes])
28
 if eval "test $enable_log_error = yes"; then
29
-  CXXFLAGS+=" -DDE265_LOG_ERROR"
30
+  CXXFLAGS="$CXXFLAGS -DDE265_LOG_ERROR"
31
 fi
32
 
33
 AC_ARG_ENABLE(log-info,
34
@@ -189,7 +189,7 @@
35
   [enable_log_info=$enableval],
36
   [enable_log_info=no])
37
 if eval "test $enable_log_info = yes"; then
38
-  CXXFLAGS+=" -DDE265_LOG_INFO"
39
+  CXXFLAGS="$CXXFLAGS -DDE265_LOG_INFO"
40
 fi
41
 
42
 AC_ARG_ENABLE(log-debug,
43
@@ -198,7 +198,7 @@
44
   [enable_log_debug=$enableval],
45
   [enable_log_debug=no])
46
 if eval "test $enable_log_debug = yes"; then
47
-  CXXFLAGS+=" -DDE265_LOG_DEBUG"
48
+  CXXFLAGS="$CXXFLAGS -DDE265_LOG_DEBUG"
49
 fi
50
 
51
 AC_ARG_ENABLE(log-trace,
52
@@ -207,7 +207,7 @@
53
   [enable_log_trace=$enableval],
54
   [enable_log_trace=no])
55
 if eval "test $enable_log_trace = yes"; then
56
-  CXXFLAGS+=" -DDE265_LOG_TRACE"
57
+  CXXFLAGS="$CXXFLAGS -DDE265_LOG_TRACE"
58
 fi
59
 
60
 
(-)b/multimedia/libde265/files/patch-disable-tools (+41 lines)
Added Link Here
1
Description: Disable building of some internal tools that no longer link
2
 because internal symbols are no longer exported.
3
Author: Joachim Bauch <bauch@struktur.de>
4
--- dec265/Makefile.am
5
+++ dec265/Makefile.am
6
@@ -1,5 +1,5 @@
7
 
8
-bin_PROGRAMS = dec265 hdrcopy
9
+bin_PROGRAMS = dec265
10
 
11
 AM_CPPFLAGS = -I$(top_srcdir)/libde265 -I$(top_srcdir)
12
 
13
@@ -9,12 +9,6 @@
14
 dec265_LDADD = ../libde265/libde265.la -lstdc++
15
 dec265_SOURCES = dec265.cc
16
 
17
-hdrcopy_DEPENDENCIES = ../libde265/libde265.la
18
-hdrcopy_CXXFLAGS =
19
-hdrcopy_LDFLAGS =
20
-hdrcopy_LDADD = ../libde265/libde265.la -lstdc++
21
-hdrcopy_SOURCES = hdrcopy.cc
22
-
23
 if HAVE_VIDEOGFX
24
   dec265_CXXFLAGS += $(VIDEOGFX_CFLAGS)
25
   dec265_LDFLAGS += $(VIDEOGFX_LIBS)
26
--- Makefile.am
27
+++ Makefile.am
28
@@ -8,13 +8,6 @@
29
 SUBDIRS+=dec265
30
 endif
31
 
32
-if ENABLE_ENCODER
33
-SUBDIRS+=enc265
34
-endif
35
-
36
-SUBDIRS+=tools
37
-SUBDIRS+=acceleration-speed
38
-
39
 if ENABLE_SHERLOCK265
40
 SUBDIRS+=sherlock265
41
 endif
(-)a/multimedia/libde265/files/patch-libde265_Makefile.am (-19 lines)
Removed Link Here
1
--- libde265/Makefile.am.orig	2015-07-22 17:41:19.854783000 +0200
2
+++ libde265/Makefile.am	2015-07-22 17:41:35.651508000 +0200
3
@@ -19,7 +19,6 @@
4
 endif
5
 
6
 libde265_la_LDFLAGS = -version-info $(LIBDE265_CURRENT):$(LIBDE265_REVISION):$(LIBDE265_AGE)
7
-libde265_la_LIBADD = -lstdc++
8
 
9
 libde265_la_SOURCES = \
10
   acceleration.h \
11
@@ -92,7 +91,7 @@
12
   vui.h
13
 
14
 SUBDIRS = encoder
15
-libde265_la_LIBADD += encoder/libde265_encoder.la
16
+libde265_la_LIBADD = encoder/libde265_encoder.la
17
 
18
 if ENABLE_SSE_OPT
19
   SUBDIRS += x86
(-)a/multimedia/libde265/files/patch-libde265_fallback-dct.cc (-11 lines)
Removed Link Here
1
--- libde265/fallback-dct.cc.orig	2015-07-14 13:51:51.000000000 +0200
2
+++ libde265/fallback-dct.cc	2015-07-22 17:24:55.690743000 +0200
3
@@ -22,7 +22,7 @@
4
 
5
 #if defined(_MSC_VER) || defined(__MINGW32__)
6
 # include <malloc.h>
7
-#else
8
+#elif defined(HAVE_ALLOCA_H)
9
 # include <alloca.h>
10
 #endif
11
 
(-)a/multimedia/libde265/files/patch-libde265_fallback-motion.cc (-11 lines)
Removed Link Here
1
--- libde265/fallback-motion.cc.orig	2015-07-14 13:51:51.000000000 +0200
2
+++ libde265/fallback-motion.cc	2015-07-22 17:25:04.707534000 +0200
3
@@ -23,7 +23,7 @@
4
 
5
 #if defined(_MSC_VER) || defined(__MINGW32__)
6
 # include <malloc.h>
7
-#else
8
+#elif defined(HAVE_ALLOCA_H)
9
 # include <alloca.h>
10
 #endif
11
 
(-)a/multimedia/libde265/files/patch-libde265_image.cc (-11 lines)
Removed Link Here
1
--- libde265/image.cc.orig	2015-07-14 13:51:51.000000000 +0200
2
+++ libde265/image.cc	2015-07-22 17:32:34.455583000 +0200
3
@@ -47,7 +47,7 @@
4
 #elif _WIN32
5
 #define ALLOC_ALIGNED(alignment, size)         _aligned_malloc((size), (alignment))
6
 #define FREE_ALIGNED(mem)                      _aligned_free((mem))
7
-#elif __APPLE__
8
+#elif defined(HAVE_POSIX_MEMALIGN)
9
 static inline void *ALLOC_ALIGNED(size_t alignment, size_t size) {
10
     void *mem = NULL;
11
     if (posix_memalign(&mem, alignment, size) != 0) {
(-)a/multimedia/libde265/files/patch-libde265_motion.cc (-11 lines)
Removed Link Here
1
--- libde265/motion.cc.orig	2015-07-14 13:51:51.000000000 +0200
2
+++ libde265/motion.cc	2015-07-22 17:25:26.140610000 +0200
3
@@ -31,7 +31,7 @@
4
 
5
 #if defined(_MSC_VER) || defined(__MINGW32__)
6
 # include <malloc.h>
7
-#else
8
+#elif defined(HAVE_ALLOCA_H)
9
 # include <alloca.h>
10
 #endif
11
 
(-)a/multimedia/libde265/files/patch-libde265_pps.cc (-11 lines)
Removed Link Here
1
--- libde265/pps.cc.orig	2015-07-14 13:51:51.000000000 +0200
2
+++ libde265/pps.cc	2015-07-22 17:25:38.546345000 +0200
3
@@ -27,7 +27,7 @@
4
 #include <string.h>
5
 #if defined(_MSC_VER) || defined(__MINGW32__)
6
 # include <malloc.h>
7
-#else
8
+#elif defined(HAVE_ALLOCA_H)
9
 # include <alloca.h>
10
 #endif
11
 
(-)a/multimedia/libde265/files/patch-libde265_refpic.cc (-11 lines)
Removed Link Here
1
--- libde265/refpic.cc.orig	2015-07-14 13:51:51.000000000 +0200
2
+++ libde265/refpic.cc	2015-07-22 17:25:52.916195000 +0200
3
@@ -26,7 +26,7 @@
4
 #include <stdlib.h>
5
 #if defined(_MSC_VER) || defined(__MINGW32__)
6
 # include <malloc.h>
7
-#else
8
+#elif defined(HAVE_ALLOCA_H)
9
 # include <alloca.h>
10
 #endif
11
 
(-)a/multimedia/libde265/files/patch-libde265_threads.cc (-11 lines)
Removed Link Here
1
--- libde265/threads.cc.orig	2015-07-14 13:51:51.000000000 +0200
2
+++ libde265/threads.cc	2015-07-22 17:26:03.712606000 +0200
3
@@ -24,7 +24,7 @@
4
 
5
 #if defined(_MSC_VER) || defined(__MINGW32__)
6
 # include <malloc.h>
7
-#else
8
+#elif defined(HAVE_ALLOCA_H)
9
 # include <alloca.h>
10
 #endif
11
 
(-)a/multimedia/libde265/files/patch-libde265_util.h (-11 lines)
Removed Link Here
1
--- libde265/util.h.orig	2015-07-22 16:48:18.032493000 +0200
2
+++ libde265/util.h	2015-07-22 16:48:43.439129000 +0200
3
@@ -70,7 +70,7 @@
4
 namespace std { using namespace std::tr1; }
5
 #endif
6
 
7
-#if __GNUC__ && GCC_VERSION < 40600
8
+#if __GNUC__ && GCC_VERSION < 40600 && !defined(__clang__)
9
 // nullptr was introduced in gcc 4.6, a simple alias should be fine for our use case
10
 #define nullptr NULL
11
 #endif
(-)b/multimedia/libde265/files/patch-only-export-decoder-api.patch (+285 lines)
Added Link Here
1
Description: Only export symbols defined in the decoder API.
2
 The encoder API is not final yet, so upstream exports all symbols to make
3
 development easier. For packaging we only want to expose the public API.
4
Author: Joachim Bauch <bauch@struktur.de>
5
--- libde265/encoder/Makefile.am
6
+++ libde265/encoder/Makefile.am
7
@@ -12,6 +12,18 @@
8
   encpicbuf.h encpicbuf.cc \
9
   sop.h sop.cc
10
 
11
+libde265_encoder_la_CFLAGS = \
12
+  $(CFLAG_VISIBILITY) \
13
+  -DLIBDE265_EXPORTS
14
+libde265_encoder_la_CXXFLAGS += \
15
+  $(CFLAG_VISIBILITY) \
16
+  -DLIBDE265_EXPORTS
17
+
18
+if HAVE_VISIBILITY
19
+ libde265_encoder_la_CFLAGS += -DHAVE_VISIBILITY
20
+ libde265_encoder_la_CXXFLAGS += -DHAVE_VISIBILITY
21
+endif
22
+
23
 SUBDIRS=algo
24
 libde265_encoder_la_LIBADD = algo/libde265_encoder_algo.la
25
 
26
--- libde265/encoder/algo/Makefile.am
27
+++ libde265/encoder/algo/Makefile.am
28
@@ -17,5 +17,13 @@
29
   tb-rateestim.h tb-rateestim.cc \
30
   pb-mv.h pb-mv.cc
31
 
32
+libde265_encoder_algo_la_CXXFLAGS += \
33
+  $(CFLAG_VISIBILITY) \
34
+  -DLIBDE265_EXPORTS
35
+
36
+if HAVE_VISIBILITY
37
+ libde265_encoder_algo_la_CXXFLAGS += -DHAVE_VISIBILITY
38
+endif
39
+
40
 EXTRA_DIST = \
41
   CMakeLists.txt
42
--- configure.ac
43
+++ configure.ac
44
@@ -56,9 +56,7 @@
45
 fi
46
 changequote([,])dnl
47
 
48
-dnl gl_VISIBILITY
49
-dnl : In encoder branch, we still export all library symbols :
50
-HAVE_VISIBILITY=0
51
+gl_VISIBILITY
52
 AM_CONDITIONAL([HAVE_VISIBILITY], [test "x$HAVE_VISIBILITY" != "x0"])
53
 
54
 # Checks for header files.
55
--- libde265/image-io.cc
56
+++ libde265/image-io.cc
57
@@ -186,7 +186,7 @@
58
 }
59
 
60
 
61
-LIBDE265_API PacketSink_File::~PacketSink_File()
62
+PacketSink_File::~PacketSink_File()
63
 {
64
   if (mFH) {
65
     fclose(mFH);
66
@@ -194,7 +194,7 @@
67
 }
68
 
69
 
70
-LIBDE265_API void PacketSink_File::set_filename(const char* filename)
71
+void PacketSink_File::set_filename(const char* filename)
72
 {
73
   assert(mFH==NULL);
74
 
75
@@ -202,7 +202,7 @@
76
 }
77
 
78
 
79
-LIBDE265_API void PacketSink_File::send_packet(const uint8_t* data, int n)
80
+void PacketSink_File::send_packet(const uint8_t* data, int n)
81
 {
82
   uint8_t startCode[3];
83
   startCode[0] = 0;
84
--- libde265/image-io.h
85
+++ libde265/image-io.h
86
@@ -30,17 +30,17 @@
87
 class ImageSource
88
 {
89
  public:
90
-  LIBDE265_API ImageSource();
91
-  virtual LIBDE265_API ~ImageSource() { }
92
+  ImageSource();
93
+  virtual ~ImageSource() { }
94
 
95
   //enum ImageStatus { Available, Waiting, EndOfVideo };
96
 
97
   //virtual ImageStatus  get_status() = 0;
98
-  virtual LIBDE265_API de265_image* get_image(bool block=true) = 0;
99
-  virtual LIBDE265_API void skip_frames(int n) = 0;
100
+  virtual de265_image* get_image(bool block=true) = 0;
101
+  virtual void skip_frames(int n) = 0;
102
 
103
-  virtual LIBDE265_API int get_width() const = 0;
104
-  virtual LIBDE265_API int get_height() const = 0;
105
+  virtual int get_width() const = 0;
106
+  virtual int get_height() const = 0;
107
 };
108
 
109
 
110
@@ -48,17 +48,17 @@
111
 class ImageSource_YUV : public ImageSource
112
 {
113
  public:
114
-  LIBDE265_API ImageSource_YUV();
115
-  virtual LIBDE265_API ~ImageSource_YUV();
116
+  ImageSource_YUV();
117
+  virtual ~ImageSource_YUV();
118
 
119
-  bool LIBDE265_API set_input_file(const char* filename, int w,int h);
120
+  bool set_input_file(const char* filename, int w,int h);
121
 
122
   //virtual ImageStatus  get_status();
123
-  virtual LIBDE265_API de265_image* get_image(bool block=true);
124
-  virtual LIBDE265_API void skip_frames(int n);
125
+  virtual de265_image* get_image(bool block=true);
126
+  virtual void skip_frames(int n);
127
 
128
-  virtual LIBDE265_API int get_width() const { return width; }
129
-  virtual LIBDE265_API int get_height() const { return height; }
130
+  virtual int get_width() const { return width; }
131
+  virtual int get_height() const { return height; }
132
 
133
  private:
134
   FILE* mFH;
135
@@ -74,20 +74,20 @@
136
 class ImageSink
137
 {
138
  public:
139
-  virtual LIBDE265_API ~ImageSink() { }
140
+  virtual ~ImageSink() { }
141
 
142
-  virtual LIBDE265_API void send_image(const de265_image* img) = 0;
143
+  virtual void send_image(const de265_image* img) = 0;
144
 };
145
 
146
 class ImageSink_YUV : public ImageSink
147
 {
148
  public:
149
- LIBDE265_API ImageSink_YUV() : mFH(NULL) { }
150
-  LIBDE265_API ~ImageSink_YUV();
151
+  ImageSink_YUV() : mFH(NULL) { }
152
+  ~ImageSink_YUV();
153
 
154
-  bool LIBDE265_API set_filename(const char* filename);
155
+  bool set_filename(const char* filename);
156
 
157
-  virtual LIBDE265_API void send_image(const de265_image* img);
158
+  virtual void send_image(const de265_image* img);
159
 
160
  private:
161
   FILE* mFH;
162
@@ -98,21 +98,21 @@
163
 class PacketSink
164
 {
165
  public:
166
-  virtual LIBDE265_API ~PacketSink() { }
167
+  virtual ~PacketSink() { }
168
 
169
-  virtual LIBDE265_API void send_packet(const uint8_t* data, int n) = 0;
170
+  virtual void send_packet(const uint8_t* data, int n) = 0;
171
 };
172
 
173
 
174
 class PacketSink_File : public PacketSink
175
 {
176
  public:
177
-  LIBDE265_API PacketSink_File();
178
-  virtual LIBDE265_API ~PacketSink_File();
179
+  PacketSink_File();
180
+  virtual ~PacketSink_File();
181
 
182
-  LIBDE265_API void set_filename(const char* filename);
183
+  void set_filename(const char* filename);
184
 
185
-  virtual LIBDE265_API void send_packet(const uint8_t* data, int n);
186
+  virtual void send_packet(const uint8_t* data, int n);
187
 
188
  private:
189
   FILE* mFH;
190
--- libde265/configparam.h
191
+++ libde265/configparam.h
192
@@ -95,7 +95,7 @@
193
   bool hasLongOption() const { return true; } //mLongOption!=NULL; }
194
   std::string getLongOption() const { return mLongOption ? std::string(mLongOption) : get_name(); }
195
 
196
-  virtual LIBDE265_API bool processCmdLineArguments(char** argv, int* argc, int idx) { return false; }
197
+  virtual bool processCmdLineArguments(char** argv, int* argc, int idx) { return false; }
198
 
199
 
200
 
201
@@ -132,7 +132,7 @@
202
   virtual std::string get_default_string() const { return default_value ? "true":"false"; }
203
 
204
   virtual std::string getTypeDescr() const { return "(boolean)"; }
205
-  virtual LIBDE265_API bool processCmdLineArguments(char** argv, int* argc, int idx) { set(true); return true; }
206
+  virtual bool processCmdLineArguments(char** argv, int* argc, int idx) { set(true); return true; }
207
 
208
   bool set(bool v) { value_set=true; value=v; return true; }
209
 
210
@@ -162,10 +162,10 @@
211
   virtual bool has_default() const { return default_set; }
212
 
213
   void set_default(std::string v) { default_value=v; default_set=true; }
214
-  virtual LIBDE265_API std::string get_default_string() const { return default_value; }
215
+  virtual std::string get_default_string() const { return default_value; }
216
 
217
-  virtual LIBDE265_API std::string getTypeDescr() const { return "(string)"; }
218
-  virtual LIBDE265_API bool processCmdLineArguments(char** argv, int* argc, int idx);
219
+  virtual std::string getTypeDescr() const { return "(string)"; }
220
+  virtual bool processCmdLineArguments(char** argv, int* argc, int idx);
221
 
222
   bool set(std::string v) { value_set=true; value=v; return true; }
223
 
224
@@ -201,10 +201,10 @@
225
   virtual bool has_default() const { return default_set; }
226
 
227
   void set_default(int v) { default_value=v; default_set=true; }
228
-  virtual LIBDE265_API std::string get_default_string() const;
229
+  virtual std::string get_default_string() const;
230
 
231
-  virtual LIBDE265_API std::string getTypeDescr() const;
232
-  virtual LIBDE265_API bool processCmdLineArguments(char** argv, int* argc, int idx);
233
+  virtual std::string getTypeDescr() const;
234
+  virtual bool processCmdLineArguments(char** argv, int* argc, int idx);
235
 
236
   bool set(int v) {
237
     if (is_valid(v)) { value_set=true; value=v; return true; }
238
@@ -239,7 +239,7 @@
239
   virtual std::vector<std::string> get_choice_names() const = 0;
240
 
241
   virtual std::string getTypeDescr() const;
242
-  virtual LIBDE265_API bool processCmdLineArguments(char** argv, int* argc, int idx);
243
+  virtual bool processCmdLineArguments(char** argv, int* argc, int idx);
244
 
245
   const char** get_choices_string_table() const;
246
 
247
@@ -368,10 +368,10 @@
248
  config_parameters() : param_string_table(NULL) { }
249
   ~config_parameters() { delete[] param_string_table; }
250
 
251
-  void LIBDE265_API add_option(option_base* o);
252
+  void add_option(option_base* o);
253
 
254
-  void LIBDE265_API print_params() const;
255
-  bool LIBDE265_API parse_command_line_params(int* argc, char** argv, int* first_idx=NULL,
256
+  void print_params() const;
257
+  bool parse_command_line_params(int* argc, char** argv, int* first_idx=NULL,
258
                                  bool ignore_unknown_options=false);
259
 
260
 
261
--- libde265/quality.h
262
+++ libde265/quality.h
263
@@ -26,11 +26,11 @@
264
 #include <libde265/image.h>
265
 
266
 
267
-LIBDE265_API uint32_t SSD(const uint8_t* img, int imgStride,
268
+uint32_t SSD(const uint8_t* img, int imgStride,
269
                           const uint8_t* ref, int refStride,
270
                           int width, int height);
271
 
272
-LIBDE265_API uint32_t SAD(const uint8_t* img, int imgStride,
273
+uint32_t SAD(const uint8_t* img, int imgStride,
274
                           const uint8_t* ref, int refStride,
275
                           int width, int height);
276
 
277
@@ -41,7 +41,7 @@
278
 LIBDE265_API double PSNR(double mse);
279
 
280
 
281
-LIBDE265_API uint32_t compute_distortion_ssd(const de265_image* img1, const de265_image* img2,
282
+uint32_t compute_distortion_ssd(const de265_image* img1, const de265_image* img2,
283
                                              int x0, int y0, int log2size, int cIdx);
284
 
285
 #endif
(-)b/multimedia/libde265/pkg-plist (-9 / +2 lines)
Lines 1-14 Link Here
1
bin/bjoentegaard
1
bin/libde265-dec265
2
bin/block-rate-estim
3
bin/enc265
4
bin/gen-enc-table
5
bin/rd-curves
6
bin/tests
7
bin/yuv-distortion
8
include/libde265/de265-version.h
2
include/libde265/de265-version.h
9
include/libde265/de265.h
3
include/libde265/de265.h
10
lib/libde265.a
11
lib/libde265.so
4
lib/libde265.so
12
lib/libde265.so.0
5
lib/libde265.so.0
13
lib/libde265.so.0.0.10
6
lib/libde265.so.0.1.1
14
libdata/pkgconfig/libde265.pc
7
libdata/pkgconfig/libde265.pc

Return to bug 251442