- updated to 15.3.0

- updated makefile and shared patch
- added linux patch (workaround some BSDisms)

diff --git a/utvideo-linux.patch b/utvideo-linux.patch
new file mode 100644 (file)
index 0000000..d5648d7
--- /dev/null
+++ b/utvideo-linux.patch
@@ -0,0 +1,34 @@
+--- utvideo-15.3.0/utv_logl/LogReader.cpp.orig 2015-11-24 20:23:07.295710349 +0100
++++ utvideo-15.3.0/utv_logl/LogReader.cpp      2015-11-24 20:23:10.349043583 +0100
+@@ -222,7 +222,9 @@
+       pthread_mutex_init(&mutexLock, NULL);\r
+ \r
+       memset(&sun, 0, sizeof(sun));\r
++#if defined(__APPLE__)\r
+       sun.sun_len = sizeof(sun);\r
++#endif\r
+       sun.sun_family = AF_UNIX;\r
+       if (GetLogSocketPath(sun.sun_path, _countof(sun.sun_path)) != 0)\r
+               return -1;\r
+--- utvideo-15.3.0/utv_logl/LogWriter.cpp.orig 2015-09-22 21:58:24.000000000 +0200
++++ utvideo-15.3.0/utv_logl/LogWriter.cpp      2015-11-24 20:38:38.805671266 +0100
+@@ -1,6 +1,7 @@
+ /* \95¶\8e\9a\83R\81[\83h\82Í\82r\82i\82h\82r \89ü\8ds\83R\81[\83h\82Í\82b\82q\82k\82e */\r
+ /* $Id$ */\r
+ \r
++#include <errno.h>\r
+ #include "stdafx.h"\r
+ #include "LogPath.h"\r
+ #include "LogWriter.h"\r
+@@ -116,7 +117,11 @@
+               return -1;\r
+       }\r
+ \r
++#if defined(__GLIBC__)\r
++      sprintf(buf, "%s[%d]\n", program_invocation_short_name, getpid());\r
++#else\r
+       sprintf(buf, "%s[%d]\n", getprogname(), getpid()); // XXX getprogname: only BSD family and MacOS\r
++#endif\r
+       if (writeLog(buf, strlen(buf)) != strlen(buf))\r
+       {\r
+               close(fdLogSock);\r

diff --git a/utvideo-makefile b/utvideo-makefile
index 43223c1beae5613d1869d6a5c208eb95634fe43c..96d52a5d1ef12894b2eeaba25ad0143e7cf34c84 100644 (file)
--- a/utvideo-makefile
+++ b/utvideo-makefile
@@ -18,6 +18,7 @@ AR=$(CROSS_PREFIX)ar
 RANLIB=$(CROSS_PREFIX)ranlib
 
 UTV_CORE_DIR=utv_core
+UTV_LOGL_DIR=utv_logl
 
 CXXFLAGS=-g -O2 -Wall -Wextra -Wno-multichar -Wno-unused-parameter -Wno-sign-compare
 
@@ -33,12 +34,12 @@ endif
 
 OBJ = $(UTV_CORE_DIR)/Codec.o \
       $(UTV_CORE_DIR)/CodecBase.o \
-      $(UTV_CORE_DIR)/Coefficient.o \
       $(UTV_CORE_DIR)/Convert.o \
       $(UTV_CORE_DIR)/DummyCodec.o \
       $(UTV_CORE_DIR)/FrameBuffer.o \
       $(UTV_CORE_DIR)/GlobalConfig.o \
       $(UTV_CORE_DIR)/HuffmanCode.o \
+      $(UTV_CORE_DIR)/Log.o \
       $(UTV_CORE_DIR)/Predict.o \
       $(UTV_CORE_DIR)/Thread.o \
       $(UTV_CORE_DIR)/TunedFunc.o \
@@ -49,7 +50,11 @@ OBJ = $(UTV_CORE_DIR)/Codec.o \
       $(UTV_CORE_DIR)/ULYUV422Codec.o \
       $(UTV_CORE_DIR)/UQ00Codec.o \
       $(UTV_CORE_DIR)/UQY2Codec.o \
-      $(UTV_CORE_DIR)/utv_core.o
+      $(UTV_CORE_DIR)/utv_core.o \
+      $(UTV_LOGL_DIR)/LogPath.o \
+      $(UTV_LOGL_DIR)/LogReader.o \
+      $(UTV_LOGL_DIR)/LogUtil.o \
+      $(UTV_LOGL_DIR)/LogWriter.o
 
 ifeq ($(ARCH),i386)
 OBJ+=$(UTV_CORE_DIR)/TunedFunc_x86.o \

diff --git a/utvideo-shared.patch b/utvideo-shared.patch
index e107f6ca497c75029cd67e9c990e1a409c72e1a4..05a3c19a776eef27cd51fb09c1011060f85098b7 100644 (file)
--- a/utvideo-shared.patch
+++ b/utvideo-shared.patch
@@ -18,7 +18,7 @@
  
 -CXXFLAGS=-g -O2 -Wall -Wextra -Wno-multichar -Wno-unused-parameter -Wno-sign-compare
 +OPTFLAGS=-g -O2
-+CXXFLAGS=$(OPTFLAGS) -Wall -Wextra -Wno-multichar -Wno-unused-parameter -Wno-sign-compare
++CXXFLAGS=$(OPTFLAGS) -Wall -Wextra -Wno-multichar -Wno-unused-parameter -Wno-sign-compare -Iinclude -Iutv_logl
  
  # on MinGW env, uncomment following lines and set proper value to WINSDK_ROOT.
  #WINSDK_ROOT="/c/Program Files/Microsoft SDKs/Windows/v6.1"

diff --git a/utvideo.spec b/utvideo.spec
index 0186a0ab2ff509a1bab464a015109ca9f75891b2..5af6495fbe57113d55fb6282f7e75af9d9d4a379 100644 (file)
--- a/utvideo.spec
+++ b/utvideo.spec
@@ -1,15 +1,16 @@
 Summary:       Ut Video codec suite
 Summary(pl.UTF-8):     Kodek Ut Video
 Name:          utvideo
-Version:       15.1.0
-Release:       2
+Version:       15.3.0
+Release:       1
 License:       GPL v2+
 Group:         Libraries
 Source0:       http://umezawa.dyndns.info/archive/utvideo/%{name}-%{version}-src.zip
-# Source0-md5: ca05df0346ed1b48641c1115c02678e0
+# Source0-md5: 92f67f20ab5a61de73740817500648f4
 Source1:       %{name}-makefile
 Patch0:                %{name}-shared.patch
 Patch1:                %{name}-includes.patch
+Patch2:                %{name}-linux.patch
 URL:           http://umezawa.dyndns.info/wordpress/?cat=28
 BuildRequires: libstdc++-devel
 BuildRequires: libtool >= 2:1.5
@@ -58,6 +59,7 @@ cp %{SOURCE1} GNUmakefile
 
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__make} \