[packages/utvideo] - updated to 13.1.0 - GNUmakefile dropped upstream, replaced with local (already updated) file - add

[qboosh]

commit d0dcda3d769d98067079c974af3ccf349a4f57dc
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Jul 14 14:38:30 2013 +0200

    - updated to 13.1.0
    - GNUmakefile dropped upstream, replaced with local (already updated) file
    - added includes patch (missing <climits> include)

 utvideo-includes.patch | 11 +++++++++++
 utvideo-update.patch   | 31 -------------------------------
 utvideo.spec           | 12 ++++++++----
 3 files changed, 19 insertions(+), 35 deletions(-)
---
diff --git a/utvideo.spec b/utvideo.spec
index bd889f2..3a1c5e7 100644
--- a/utvideo.spec
+++ b/utvideo.spec
@@ -1,14 +1,15 @@
 Summary:	Ut Video codec suite
 Summary(pl.UTF-8):	Kodek Ut Video
 Name:		utvideo
-Version:	12.0.1
+Version:	13.1.0
 Release:	1
 License:	GPL v2+
 Group:		Libraries
 Source0:	http://umezawa.dyndns.info/archive/utvideo/%{name}-%{version}-src.zip
-# Source0-md5:	b5ac67032376f911574e0a32ac10cdcf
-Patch0:		%{name}-update.patch
-Patch1:		%{name}-shared.patch
+# Source0-md5:	330604ceb0ddd862efb840d14c155dcd
+Source1:	%{name}-makefile
+Patch0:		%{name}-shared.patch
+Patch1:		%{name}-includes.patch
 URL:		http://umezawa.dyndns.info/wordpress/?cat=28
 BuildRequires:	libstdc++-devel
 BuildRequires:	libtool >= 2:1.5
@@ -52,6 +53,9 @@ Statyczna biblioteka Ut Video.
 
 %prep
 %setup -q
+
+cp %{SOURCE1} GNUmakefile
+
 %patch0 -p1
 %patch1 -p1
 
diff --git a/utvideo-includes.patch b/utvideo-includes.patch
new file mode 100644
index 0000000..5b5ceb2
--- /dev/null
+++ b/utvideo-includes.patch
@@ -0,0 +1,11 @@
+--- utvideo-13.1.0/utv_core/ColorOrder.h.orig	2013-05-21 22:53:00.000000000 +0200
++++ utvideo-13.1.0/utv_core/ColorOrder.h	2013-07-14 14:19:47.319963786 +0200
+@@ -3,6 +3,8 @@
+ 
+ #pragma once
+ 
++#include <climits>
++
+ class CBGRColorOrder
+ {
+ public:
diff --git a/utvideo-update.patch b/utvideo-update.patch
deleted file mode 100644
index 879fb6a..0000000
--- a/utvideo-update.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- utvideo-12.0.1/GNUmakefile.orig	2011-11-08 03:18:38.000000000 +0100
-+++ utvideo-12.0.1/GNUmakefile	2013-01-18 19:43:42.962655943 +0100
-@@ -34,7 +34,6 @@
- OBJ = $(UTV_CORE_DIR)/Codec.o \
-       $(UTV_CORE_DIR)/Convert.o \
-       $(UTV_CORE_DIR)/DummyCodec.o \
--      $(UTV_CORE_DIR)/Format.o \
-       $(UTV_CORE_DIR)/FrameBuffer.o \
-       $(UTV_CORE_DIR)/GlobalConfig.o \
-       $(UTV_CORE_DIR)/HuffmanCode.o \
-@@ -48,6 +47,20 @@
-       $(UTV_CORE_DIR)/ULY2Codec.o \
-       $(UTV_CORE_DIR)/utv_core.o
- 
-+ifeq ($(ARCH),i386)
-+OBJ+=$(UTV_CORE_DIR)/TunedFunc_x86.o \
-+	$(UTV_CORE_DIR)/Convert_asm_x86.o \
-+	$(UTV_CORE_DIR)/HuffmanCode_asm_x86.o \
-+	$(UTV_CORE_DIR)/Predict_asm_x86.o
-+endif
-+# note: TunedFunc_x64.cpp supports only MSC
-+#ifeq ($(ARCH),x86_64)
-+#OBJ+=$(UTV_CORE_DIR)/TunedFunc_x64.o \
-+#	$(UTV_CORE_DIR)/Convert_asm_x64.o \
-+#	$(UTV_CORE_DIR)/HuffmanCode_asm_x64.o \
-+#	$(UTV_CORE_DIR)/Predict_asm_x64.o
-+#endif
-+
- %.a:
- 	$(AR) rcu $@ $^
- 	$(RANLIB) $@
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/utvideo.git/commitdiff/d0dcda3d769d98067079c974af3ccf349a4f57dc