[packages/utvideo] - updated to 12.0.1 - added update patch (adjusts GNUMakefile for 12.0.x) - adjusted shared patch to

qboosh qboosh at pld-linux.org
Fri Jan 18 21:08:21 CET 2013


commit da2db957c05cd4fc53dedb3570b29a5a3fcd5a46
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Fri Jan 18 21:08:48 2013 +0100

    - updated to 12.0.1
    - added update patch (adjusts GNUMakefile for 12.0.x)
    - adjusted shared patch to support asm tuned functions (not used finally because of buggy GNUC code in .cpp)

 utvideo-shared.patch |  9 ++++++---
 utvideo-update.patch | 31 +++++++++++++++++++++++++++++++
 utvideo.spec         | 15 ++++++++++++---
 3 files changed, 49 insertions(+), 6 deletions(-)
---
diff --git a/utvideo.spec b/utvideo.spec
index 9aa646f..bd889f2 100644
--- a/utvideo.spec
+++ b/utvideo.spec
@@ -1,16 +1,20 @@
 Summary:	Ut Video codec suite
 Summary(pl.UTF-8):	Kodek Ut Video
 Name:		utvideo
-Version:	11.1.1
+Version:	12.0.1
 Release:	1
 License:	GPL v2+
 Group:		Libraries
 Source0:	http://umezawa.dyndns.info/archive/utvideo/%{name}-%{version}-src.zip
-# Source0-md5:	9e5a1d3e1e711790f614920541918ebc
-Patch0:		%{name}-shared.patch
+# Source0-md5:	b5ac67032376f911574e0a32ac10cdcf
+Patch0:		%{name}-update.patch
+Patch1:		%{name}-shared.patch
 URL:		http://umezawa.dyndns.info/wordpress/?cat=28
 BuildRequires:	libstdc++-devel
 BuildRequires:	libtool >= 2:1.5
+#%ifarch i586 i686 pentium2 pentium3 pentium4
+#BuildRequires:	nasm
+#%endif
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -49,6 +53,7 @@ Statyczna biblioteka Ut Video.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__make} \
@@ -56,6 +61,10 @@ Statyczna biblioteka Ut Video.
 	OPTFLAGS="%{rpmcxxflags} %{rpmcppflags}" \
 	V=1 \
 	libdir=%{_libdir}
+# TunedFunc_x86.cpp compilation fails
+#%ifarch i586 i686 pentium2 pentium3 pentium4
+#	ARCH=i386 \
+#%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
diff --git a/utvideo-shared.patch b/utvideo-shared.patch
index ee9a553..352912f 100644
--- a/utvideo-shared.patch
+++ b/utvideo-shared.patch
@@ -22,7 +22,7 @@
  
  # on MinGW env, uncomment following lines and set proper value to WINSDK_ROOT.
  #WINSDK_ROOT="/c/Program Files/Microsoft SDKs/Windows/v6.1"
-@@ -48,15 +50,23 @@
+@@ -48,15 +50,26 @@
        $(UTV_CORE_DIR)/ULY2Codec.o \
        $(UTV_CORE_DIR)/utv_core.o
  
@@ -37,7 +37,10 @@
 +	$(LIBTOOL) --mode=link $(CXX) -o $@ $^ -rpath $(libdir) -lpthread
 +
 +%.lo: %.cpp
-+	$(LIBTOOL) --mode=compile $(CXX) $(CXXFLAGS) -c -o $@ $<
++	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(CXXFLAGS) -c -o $@ $<
++
++%.lo: %.asm
++	$(LIBTOOL) --tag=NASM --mode=compile nasm -felf -I$(UTV_CORE_DIR)/ -o $@ $<
 +
 +all: lib
  
@@ -49,7 +52,7 @@
  
  clean:
  	@printf " RM\t$(UTV_CORE_DIR)/*.o\n";
-@@ -65,25 +75,25 @@
+@@ -65,25 +78,25 @@
  	@rm -f $(UTV_CORE_DIR)/libutvideo.a
  
  install: all
diff --git a/utvideo-update.patch b/utvideo-update.patch
new file mode 100644
index 0000000..879fb6a
--- /dev/null
+++ b/utvideo-update.patch
@@ -0,0 +1,31 @@
+--- 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/da2db957c05cd4fc53dedb3570b29a5a3fcd5a46



More information about the pld-cvs-commit mailing list