From 61a59a3108393864a1a1b0bb8170d2de0cbfab12d75f4d70f92c446add2fe885 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Thu, 18 Mar 2010 14:42:23 +0000 Subject: [PATCH 01/13] Updating link to change in openSUSE:Factory/dirac revision 7.0 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/dirac?expand=0&rev=ce53bd4ba6e16b2723f90eac0bf5b00b --- ...d-memory-read-that-causes-the-encode.patch | 52 ------------------- dirac-1.0.2-gcc45.patch | 22 -------- dirac.changes | 17 ------ dirac.spec | 45 ++++------------ 4 files changed, 10 insertions(+), 126 deletions(-) delete mode 100644 0001-Fix-uninitialised-memory-read-that-causes-the-encode.patch delete mode 100644 dirac-1.0.2-gcc45.patch diff --git a/0001-Fix-uninitialised-memory-read-that-causes-the-encode.patch b/0001-Fix-uninitialised-memory-read-that-causes-the-encode.patch deleted file mode 100644 index 0392ec5..0000000 --- a/0001-Fix-uninitialised-memory-read-that-causes-the-encode.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 88fae6224b54ecf92ac6e3ae5083c3f352adc798 Mon Sep 17 00:00:00 2001 -From: Anuradha Suraparaju -Date: Fri, 17 Apr 2009 17:47:27 +1000 -Subject: [PATCH] Fix uninitialised memory read that causes the encoder to crash when using - non-overlapping blocks. - ---- - libdirac_common/mot_comp.cpp | 21 +++++++++++++++------ - 1 files changed, 15 insertions(+), 6 deletions(-) - -diff --git a/libdirac_common/mot_comp.cpp b/libdirac_common/mot_comp.cpp -index aa8d37c..e0ec2ff 100644 ---- a/libdirac_common/mot_comp.cpp -+++ b/libdirac_common/mot_comp.cpp -@@ -306,6 +306,8 @@ void MotionCompensator::CompensateComponent( Picture* pic , - - int save_from_row = m_bparams.Ybsep()-m_bparams.Yoffset(); - -+ bool row_overlap = ((m_bparams.Yblen() - m_bparams.Ybsep()) > 0); -+ - // unpadded picture dimensions - const int x_end_data = pic_data_out.FirstX() + std::min(pic_data_out.LengthX(), pic_size.x ); - const int y_end_data = pic_data_out.FirstY() + std::min(pic_data_out.LengthY(), pic_size.y ); -@@ -489,12 +491,19 @@ void MotionCompensator::CompensateComponent( Picture* pic , - //Increment the block vertical position - pos.y += m_bparams.Ybsep(); - -- // Copy the rows required to motion compensate the next row of block. -- // This is usually Yblen-Ybsep rows. -- memmove (pic_data[0], pic_data[save_from_row], (m_bparams.Yblen() - save_from_row)*pic_data.LengthX()*sizeof(ValueType)); -- memset( pic_data[m_bparams.Yblen() - save_from_row], 0, save_from_row*pic_data.LengthX()*sizeof(ValueType) ); -- save_from_row = m_bparams.Ybsep(); -- -+ if (row_overlap) -+ { -+ // Copy the rows required to motion compensate the next row of -+ // blocks. This is usually Yblen-Ybsep rows. -+ memmove (pic_data[0], pic_data[save_from_row], (m_bparams.Yblen() - save_from_row)*pic_data.LengthX()*sizeof(ValueType)); -+ memset( pic_data[m_bparams.Yblen() - save_from_row], 0, save_from_row*pic_data.LengthX()*sizeof(ValueType) ); -+ save_from_row = m_bparams.Ybsep(); -+ } -+ else -+ { -+ // no row overlap. So reset pic_data to 0. -+ memset( pic_data[0], 0, m_bparams.Yblen()*pic_data.LengthX()*sizeof(ValueType) ); -+ } - }//yblock - - if ( m_add_or_sub == SUBTRACT) --- -1.7.0.3 - diff --git a/dirac-1.0.2-gcc45.patch b/dirac-1.0.2-gcc45.patch deleted file mode 100644 index 7ae1b85..0000000 --- a/dirac-1.0.2-gcc45.patch +++ /dev/null @@ -1,22 +0,0 @@ -Index: dirac-1.0.2/libdirac_encoder/quant_chooser.cpp -=================================================================== ---- dirac-1.0.2.orig/libdirac_encoder/quant_chooser.cpp -+++ dirac-1.0.2/libdirac_encoder/quant_chooser.cpp -@@ -340,7 +340,7 @@ void QuantChooser::SetSkip( CodeBlock& c - { - for (int i=cblock.Xstart(); i= u_threshold ) -+ if ( (static_cast(std::abs(m_coeff_data[j][i]))<<2) >= u_threshold ) - can_skip = false; - } - } -@@ -355,7 +355,7 @@ CoeffType QuantChooser::BlockAbsMax( con - { - for (int i=node.Xp() ; i(std::abs(m_coeff_data[j][i])) ); - }// i - }// j - diff --git a/dirac.changes b/dirac.changes index fbdffb3..1e79549 100644 --- a/dirac.changes +++ b/dirac.changes @@ -1,20 +1,3 @@ -------------------------------------------------------------------- -Mon May 24 13:25:36 UTC 2010 - davejplater@gmail.com - -- Split off doc subpackage - -------------------------------------------------------------------- -Mon May 24 07:01:37 UTC 2010 - davejplater@gmail.com - -- Added Provides: and Obsoletes: for packman libdirac-devel -- Included patch from dirac git to fix uninitialised memory read - that causes the encoder to crash when using non-overlapping blocks. - -------------------------------------------------------------------- -Sun May 9 08:49:10 UTC 2010 - davejplater@gmail.com - -- Fixed factory build with patch from git dirac-1.0.2-gcc45.patch - ------------------------------------------------------------------- Fri Dec 18 22:46:01 CET 2009 - jengelh@medozas.de diff --git a/dirac.spec b/dirac.spec index 8dbc5f5..750197d 100644 --- a/dirac.spec +++ b/dirac.spec @@ -1,7 +1,7 @@ # # spec file for package dirac (Version 1.0.2) # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,18 +20,16 @@ Name: dirac Version: 1.0.2 -Release: 5 +Release: 3 Url: http://diracvideo.org/ Group: Productivity/Multimedia/Video/Editors and Convertors License: MPL .. -Summary: The Dirac_Video Codec +Summary: Dirac Video Codec Source: %{name}-%{version}.tar.bz2 -Patch0: 0001-Fix-uninitialised-memory-read-that-causes-the-encode.patch -Patch1: %{name}-%{version}-gcc45.patch BuildRequires: gcc-c++ libstdc++-devel BuildRequires: libcppunit-devel %ifnarch ia64 s390 s390x %sparc -BuildRequires: pkg-config valgrind-devel +BuildRequires: valgrind-devel %endif BuildRequires: doxygen fdupes graphviz-gd texlive-latex BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -167,11 +165,8 @@ Authors: License: MPL .. Group: Development/Libraries/C and C++ Summary: Development Files for Dirac Video Codec -AutoReqProv: on Requires: libdirac_decoder0 = %{version} Requires: libdirac_encoder0 = %{version} -Provides: libdirac-devel = %{version}-%{release} -Obsoletes: libdirac-devel < %{version}-%{release} %description devel Dirac is an open source video codec. It uses a traditional hybrid video @@ -212,22 +207,8 @@ Authors: Peter Bleackley , BBC Research and Development Myo Tun , Brunel University -%package doc -License: MPL .. -Group: Documentation/HTML -Summary: Dirac Video Codec api documentation -%if 0%{?suse_version} > 1110 -BuildArch: noarch -%endif - -%description doc -This package provides the api reference documentation for using dirac libraries -in your program. - %prep %setup -q -%patch0 -p1 -%patch1 -p1 # Code is not mature enough for -Werror (unused results) sed -i 's/-Werror//' configure.ac @@ -241,10 +222,8 @@ export CXXFLAGS="$RPM_OPT_FLAGS -O0" %endif %endif %configure\ - --disable-static \ - --docdir=%{_docdir}/packages/%{name} -%{__make} %{?jobs:-j%jobs} -#htmldir=%{_docdir}/%{name}/code/api_html + --disable-static +%{__make} %{?jobs:-j%jobs} htmldir=%{_docdir}/%{name}/code/api_html %install %makeinstall htmldir=%{_docdir}/%{name}/code/api_html @@ -265,8 +244,8 @@ export CXXFLAGS="$RPM_OPT_FLAGS -O0" %files %defattr (-, root, root) -#%%doc AUTHORS COPYING ChangeLog NEWS README TODO -#%%doc %{_docdir}/%{name}/[ACNRT]* +%doc %dir %{_docdir}/%{name} +%doc %{_docdir}/%{name}/[ACNRT]* %{_bindir}/* %files -n libdirac_decoder0 @@ -279,14 +258,10 @@ export CXXFLAGS="$RPM_OPT_FLAGS -O0" %files devel %defattr (-, root, root) -#%%doc %{_docdir}/%{name}/[ACNRT]* +%doc %{_docdir}/%{name}/code %{_libdir}/*.so #%{_libdir}/*.*a %{_libdir}/pkgconfig/*.pc -%{_includedir}/%{name} - -%files doc -%defattr (-, root, root) -%doc %{_docdir}/%{name} +%{_includedir}/dirac %changelog From cf97cda1591c84a4dc0eb291dbe7c587cbeb71716d2bff1e6dc948824ace26b6 Mon Sep 17 00:00:00 2001 From: Dave Plater Date: Sun, 9 May 2010 08:36:56 +0000 Subject: [PATCH 02/13] OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/dirac?expand=0&rev=9 --- dirac-1.0.2-gcc45.patch | 22 ++++++++++++++++++++++ dirac.spec | 6 ++++-- 2 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 dirac-1.0.2-gcc45.patch diff --git a/dirac-1.0.2-gcc45.patch b/dirac-1.0.2-gcc45.patch new file mode 100644 index 0000000..7ae1b85 --- /dev/null +++ b/dirac-1.0.2-gcc45.patch @@ -0,0 +1,22 @@ +Index: dirac-1.0.2/libdirac_encoder/quant_chooser.cpp +=================================================================== +--- dirac-1.0.2.orig/libdirac_encoder/quant_chooser.cpp ++++ dirac-1.0.2/libdirac_encoder/quant_chooser.cpp +@@ -340,7 +340,7 @@ void QuantChooser::SetSkip( CodeBlock& c + { + for (int i=cblock.Xstart(); i= u_threshold ) ++ if ( (static_cast(std::abs(m_coeff_data[j][i]))<<2) >= u_threshold ) + can_skip = false; + } + } +@@ -355,7 +355,7 @@ CoeffType QuantChooser::BlockAbsMax( con + { + for (int i=node.Xp() ; i(std::abs(m_coeff_data[j][i])) ); + }// i + }// j + diff --git a/dirac.spec b/dirac.spec index 750197d..2b6ca20 100644 --- a/dirac.spec +++ b/dirac.spec @@ -23,9 +23,10 @@ Version: 1.0.2 Release: 3 Url: http://diracvideo.org/ Group: Productivity/Multimedia/Video/Editors and Convertors -License: MPL .. -Summary: Dirac Video Codec +License: MPL +Summary: The dirac Video Codec Source: %{name}-%{version}.tar.bz2 +Patch0: %{name}-%{version}-gcc45.patch BuildRequires: gcc-c++ libstdc++-devel BuildRequires: libcppunit-devel %ifnarch ia64 s390 s390x %sparc @@ -209,6 +210,7 @@ Authors: %prep %setup -q +%patch0 -p1 # Code is not mature enough for -Werror (unused results) sed -i 's/-Werror//' configure.ac From 315baf80bc36f02f6c53651d27edb8c9a1d81e30edd0f6199aa4f778fbfcb566 Mon Sep 17 00:00:00 2001 From: Dave Plater Date: Sun, 9 May 2010 08:51:37 +0000 Subject: [PATCH 03/13] - Fixed factory build with patch from git dirac-1.0.2-gcc45.patch OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/dirac?expand=0&rev=10 --- dirac.changes | 5 +++++ dirac.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dirac.changes b/dirac.changes index 1e79549..65278f8 100644 --- a/dirac.changes +++ b/dirac.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun May 9 08:49:10 UTC 2010 - davejplater@gmail.com + +- Fixed factory build with patch from git dirac-1.0.2-gcc45.patch + ------------------------------------------------------------------- Fri Dec 18 22:46:01 CET 2009 - jengelh@medozas.de diff --git a/dirac.spec b/dirac.spec index 2b6ca20..a036201 100644 --- a/dirac.spec +++ b/dirac.spec @@ -30,7 +30,7 @@ Patch0: %{name}-%{version}-gcc45.patch BuildRequires: gcc-c++ libstdc++-devel BuildRequires: libcppunit-devel %ifnarch ia64 s390 s390x %sparc -BuildRequires: valgrind-devel +BuildRequires: valgrind-devel pkg-config %endif BuildRequires: doxygen fdupes graphviz-gd texlive-latex BuildRoot: %{_tmppath}/%{name}-%{version}-build From fc454ab17ee348e14f667a93c30ad47af05dc4e47cbb6fdabb5715a89d85f265 Mon Sep 17 00:00:00 2001 From: Dave Plater Date: Tue, 11 May 2010 09:04:10 +0000 Subject: [PATCH 04/13] - Added Conflicts: for conflicting packman packages OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/dirac?expand=0&rev=11 --- dirac.changes | 5 +++++ dirac.spec | 2 ++ 2 files changed, 7 insertions(+) diff --git a/dirac.changes b/dirac.changes index 65278f8..92ce43c 100644 --- a/dirac.changes +++ b/dirac.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue May 11 09:00:33 UTC 2010 - davejplater@gmail.com + +- Added Conflicts: for conflicting packman packages + ------------------------------------------------------------------- Sun May 9 08:49:10 UTC 2010 - davejplater@gmail.com diff --git a/dirac.spec b/dirac.spec index a036201..94a5ad3 100644 --- a/dirac.spec +++ b/dirac.spec @@ -34,6 +34,7 @@ BuildRequires: valgrind-devel pkg-config %endif BuildRequires: doxygen fdupes graphviz-gd texlive-latex BuildRoot: %{_tmppath}/%{name}-%{version}-build +Conflicts: dirac-doc %description Dirac is an open source video codec. It uses a traditional hybrid video @@ -168,6 +169,7 @@ Group: Development/Libraries/C and C++ Summary: Development Files for Dirac Video Codec Requires: libdirac_decoder0 = %{version} Requires: libdirac_encoder0 = %{version} +Conflicts: libdirac-devel %description devel Dirac is an open source video codec. It uses a traditional hybrid video From f432ae20abf95562bbfa6d86eb0745e7c8bf476b277bb6d7b26be6b48cfae571 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Wed, 12 May 2010 16:22:48 +0000 Subject: [PATCH 05/13] Accepting request 39695 from multimedia:libs checked in (request 39695) OBS-URL: https://build.opensuse.org/request/show/39695 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/dirac?expand=0&rev=12 --- dirac-1.0.2-gcc45.patch | 22 ---------------------- dirac.changes | 5 ----- dirac.spec | 8 +++----- 3 files changed, 3 insertions(+), 32 deletions(-) delete mode 100644 dirac-1.0.2-gcc45.patch diff --git a/dirac-1.0.2-gcc45.patch b/dirac-1.0.2-gcc45.patch deleted file mode 100644 index 7ae1b85..0000000 --- a/dirac-1.0.2-gcc45.patch +++ /dev/null @@ -1,22 +0,0 @@ -Index: dirac-1.0.2/libdirac_encoder/quant_chooser.cpp -=================================================================== ---- dirac-1.0.2.orig/libdirac_encoder/quant_chooser.cpp -+++ dirac-1.0.2/libdirac_encoder/quant_chooser.cpp -@@ -340,7 +340,7 @@ void QuantChooser::SetSkip( CodeBlock& c - { - for (int i=cblock.Xstart(); i= u_threshold ) -+ if ( (static_cast(std::abs(m_coeff_data[j][i]))<<2) >= u_threshold ) - can_skip = false; - } - } -@@ -355,7 +355,7 @@ CoeffType QuantChooser::BlockAbsMax( con - { - for (int i=node.Xp() ; i(std::abs(m_coeff_data[j][i])) ); - }// i - }// j - diff --git a/dirac.changes b/dirac.changes index 92ce43c..bd6ce9e 100644 --- a/dirac.changes +++ b/dirac.changes @@ -3,11 +3,6 @@ Tue May 11 09:00:33 UTC 2010 - davejplater@gmail.com - Added Conflicts: for conflicting packman packages -------------------------------------------------------------------- -Sun May 9 08:49:10 UTC 2010 - davejplater@gmail.com - -- Fixed factory build with patch from git dirac-1.0.2-gcc45.patch - ------------------------------------------------------------------- Fri Dec 18 22:46:01 CET 2009 - jengelh@medozas.de diff --git a/dirac.spec b/dirac.spec index 94a5ad3..22bff76 100644 --- a/dirac.spec +++ b/dirac.spec @@ -23,14 +23,13 @@ Version: 1.0.2 Release: 3 Url: http://diracvideo.org/ Group: Productivity/Multimedia/Video/Editors and Convertors -License: MPL -Summary: The dirac Video Codec +License: MPL .. +Summary: Dirac Video Codec Source: %{name}-%{version}.tar.bz2 -Patch0: %{name}-%{version}-gcc45.patch BuildRequires: gcc-c++ libstdc++-devel BuildRequires: libcppunit-devel %ifnarch ia64 s390 s390x %sparc -BuildRequires: valgrind-devel pkg-config +BuildRequires: valgrind-devel %endif BuildRequires: doxygen fdupes graphviz-gd texlive-latex BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -212,7 +211,6 @@ Authors: %prep %setup -q -%patch0 -p1 # Code is not mature enough for -Werror (unused results) sed -i 's/-Werror//' configure.ac From bfdc88f0d2fe3384a45e5a5fd6e8c59a9090c4fe78fc5d5cfe57479f8c69e843 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Wed, 12 May 2010 16:22:49 +0000 Subject: [PATCH 06/13] Updating link to change in openSUSE:Factory/dirac revision 8.0 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/dirac?expand=0&rev=b75b927ea64d2c8fdb88e1ef8e0c2d9f --- dirac-1.0.2-gcc45.patch | 22 ++++++++++++++++++++++ dirac.changes | 5 +++++ dirac.spec | 10 ++++++---- 3 files changed, 33 insertions(+), 4 deletions(-) create mode 100644 dirac-1.0.2-gcc45.patch diff --git a/dirac-1.0.2-gcc45.patch b/dirac-1.0.2-gcc45.patch new file mode 100644 index 0000000..7ae1b85 --- /dev/null +++ b/dirac-1.0.2-gcc45.patch @@ -0,0 +1,22 @@ +Index: dirac-1.0.2/libdirac_encoder/quant_chooser.cpp +=================================================================== +--- dirac-1.0.2.orig/libdirac_encoder/quant_chooser.cpp ++++ dirac-1.0.2/libdirac_encoder/quant_chooser.cpp +@@ -340,7 +340,7 @@ void QuantChooser::SetSkip( CodeBlock& c + { + for (int i=cblock.Xstart(); i= u_threshold ) ++ if ( (static_cast(std::abs(m_coeff_data[j][i]))<<2) >= u_threshold ) + can_skip = false; + } + } +@@ -355,7 +355,7 @@ CoeffType QuantChooser::BlockAbsMax( con + { + for (int i=node.Xp() ; i(std::abs(m_coeff_data[j][i])) ); + }// i + }// j + diff --git a/dirac.changes b/dirac.changes index bd6ce9e..92ce43c 100644 --- a/dirac.changes +++ b/dirac.changes @@ -3,6 +3,11 @@ Tue May 11 09:00:33 UTC 2010 - davejplater@gmail.com - Added Conflicts: for conflicting packman packages +------------------------------------------------------------------- +Sun May 9 08:49:10 UTC 2010 - davejplater@gmail.com + +- Fixed factory build with patch from git dirac-1.0.2-gcc45.patch + ------------------------------------------------------------------- Fri Dec 18 22:46:01 CET 2009 - jengelh@medozas.de diff --git a/dirac.spec b/dirac.spec index 22bff76..5af702a 100644 --- a/dirac.spec +++ b/dirac.spec @@ -1,7 +1,7 @@ # # spec file for package dirac (Version 1.0.2) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,16 +20,17 @@ Name: dirac Version: 1.0.2 -Release: 3 +Release: 4 Url: http://diracvideo.org/ Group: Productivity/Multimedia/Video/Editors and Convertors License: MPL .. -Summary: Dirac Video Codec +Summary: The dirac Video Codec Source: %{name}-%{version}.tar.bz2 +Patch0: %{name}-%{version}-gcc45.patch BuildRequires: gcc-c++ libstdc++-devel BuildRequires: libcppunit-devel %ifnarch ia64 s390 s390x %sparc -BuildRequires: valgrind-devel +BuildRequires: pkg-config valgrind-devel %endif BuildRequires: doxygen fdupes graphviz-gd texlive-latex BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -211,6 +212,7 @@ Authors: %prep %setup -q +%patch0 -p1 # Code is not mature enough for -Werror (unused results) sed -i 's/-Werror//' configure.ac From 720f411d503c0f31d445e5677fa3a627872e4ee59c4eeb0abf534ccbb8e7b97a Mon Sep 17 00:00:00 2001 From: Dave Plater Date: Mon, 17 May 2010 13:52:38 +0000 Subject: [PATCH 07/13] OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/dirac?expand=0&rev=13 --- dirac.changes | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dirac.changes b/dirac.changes index 92ce43c..65278f8 100644 --- a/dirac.changes +++ b/dirac.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Tue May 11 09:00:33 UTC 2010 - davejplater@gmail.com - -- Added Conflicts: for conflicting packman packages - ------------------------------------------------------------------- Sun May 9 08:49:10 UTC 2010 - davejplater@gmail.com From 284b487368c4c27792ab1b36069d0e0fb216b36608f1074a4815267302f198b0 Mon Sep 17 00:00:00 2001 From: Dave Plater Date: Mon, 17 May 2010 13:55:39 +0000 Subject: [PATCH 08/13] - Added conflicts: for conflicting packman packages OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/dirac?expand=0&rev=14 --- dirac.changes | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dirac.changes b/dirac.changes index 65278f8..a0c4421 100644 --- a/dirac.changes +++ b/dirac.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon May 17 13:54:50 UTC 2010 - davejplater@gmail.com + +- Added conflicts: for conflicting packman packages + ------------------------------------------------------------------- Sun May 9 08:49:10 UTC 2010 - davejplater@gmail.com From 12ce845346d70ff2a63f9df68502cc8386b7f2066a5a9ad82ff6f7fd833943f0 Mon Sep 17 00:00:00 2001 From: Dave Plater Date: Mon, 24 May 2010 06:48:19 +0000 Subject: [PATCH 09/13] OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/dirac?expand=0&rev=15 --- dirac.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dirac.spec b/dirac.spec index 5af702a..ac61971 100644 --- a/dirac.spec +++ b/dirac.spec @@ -34,7 +34,6 @@ BuildRequires: pkg-config valgrind-devel %endif BuildRequires: doxygen fdupes graphviz-gd texlive-latex BuildRoot: %{_tmppath}/%{name}-%{version}-build -Conflicts: dirac-doc %description Dirac is an open source video codec. It uses a traditional hybrid video @@ -169,7 +168,8 @@ Group: Development/Libraries/C and C++ Summary: Development Files for Dirac Video Codec Requires: libdirac_decoder0 = %{version} Requires: libdirac_encoder0 = %{version} -Conflicts: libdirac-devel +Provides: libdirac-devel = %{version} dirac-doc = %{version} +Obsoletes: libdirac-devel <= %{version} dirac-doc <= %{version} %description devel Dirac is an open source video codec. It uses a traditional hybrid video From 7cc1dfe7f1bcab7098dcf17ba3d8e45647ce355410207605957e0ecf14f96627 Mon Sep 17 00:00:00 2001 From: Dave Plater Date: Mon, 24 May 2010 07:32:18 +0000 Subject: [PATCH 10/13] - Added Provides: and Obsoletes: for packman libdirac-devel and dirac-doc which are merged in openSUSE dirac-devel. OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/dirac?expand=0&rev=16 --- dirac.changes | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dirac.changes b/dirac.changes index a0c4421..9330254 100644 --- a/dirac.changes +++ b/dirac.changes @@ -1,7 +1,8 @@ ------------------------------------------------------------------- -Mon May 17 13:54:50 UTC 2010 - davejplater@gmail.com +Mon May 24 07:01:37 UTC 2010 - davejplater@gmail.com -- Added conflicts: for conflicting packman packages +- Added Provides: and Obsoletes: for packman libdirac-devel and + dirac-doc which are merged in openSUSE dirac-devel. ------------------------------------------------------------------- Sun May 9 08:49:10 UTC 2010 - davejplater@gmail.com From 73fefaedfda85534a1ef64b98efa6700049da85786d9e53676ee7e599c5f152d Mon Sep 17 00:00:00 2001 From: Dave Plater Date: Mon, 24 May 2010 14:10:58 +0000 Subject: [PATCH 11/13] Accepting request 40581 from home:plater Copy from home:plater/dirac via accept of submit request 40581 revision 6. Request was accepted with message: Reviewed ok OBS-URL: https://build.opensuse.org/request/show/40581 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/dirac?expand=0&rev=17 --- ...d-memory-read-that-causes-the-encode.patch | 52 +++++++++++++++++++ dirac.changes | 10 +++- dirac.spec | 42 +++++++++++---- 3 files changed, 92 insertions(+), 12 deletions(-) create mode 100644 0001-Fix-uninitialised-memory-read-that-causes-the-encode.patch diff --git a/0001-Fix-uninitialised-memory-read-that-causes-the-encode.patch b/0001-Fix-uninitialised-memory-read-that-causes-the-encode.patch new file mode 100644 index 0000000..0392ec5 --- /dev/null +++ b/0001-Fix-uninitialised-memory-read-that-causes-the-encode.patch @@ -0,0 +1,52 @@ +From 88fae6224b54ecf92ac6e3ae5083c3f352adc798 Mon Sep 17 00:00:00 2001 +From: Anuradha Suraparaju +Date: Fri, 17 Apr 2009 17:47:27 +1000 +Subject: [PATCH] Fix uninitialised memory read that causes the encoder to crash when using + non-overlapping blocks. + +--- + libdirac_common/mot_comp.cpp | 21 +++++++++++++++------ + 1 files changed, 15 insertions(+), 6 deletions(-) + +diff --git a/libdirac_common/mot_comp.cpp b/libdirac_common/mot_comp.cpp +index aa8d37c..e0ec2ff 100644 +--- a/libdirac_common/mot_comp.cpp ++++ b/libdirac_common/mot_comp.cpp +@@ -306,6 +306,8 @@ void MotionCompensator::CompensateComponent( Picture* pic , + + int save_from_row = m_bparams.Ybsep()-m_bparams.Yoffset(); + ++ bool row_overlap = ((m_bparams.Yblen() - m_bparams.Ybsep()) > 0); ++ + // unpadded picture dimensions + const int x_end_data = pic_data_out.FirstX() + std::min(pic_data_out.LengthX(), pic_size.x ); + const int y_end_data = pic_data_out.FirstY() + std::min(pic_data_out.LengthY(), pic_size.y ); +@@ -489,12 +491,19 @@ void MotionCompensator::CompensateComponent( Picture* pic , + //Increment the block vertical position + pos.y += m_bparams.Ybsep(); + +- // Copy the rows required to motion compensate the next row of block. +- // This is usually Yblen-Ybsep rows. +- memmove (pic_data[0], pic_data[save_from_row], (m_bparams.Yblen() - save_from_row)*pic_data.LengthX()*sizeof(ValueType)); +- memset( pic_data[m_bparams.Yblen() - save_from_row], 0, save_from_row*pic_data.LengthX()*sizeof(ValueType) ); +- save_from_row = m_bparams.Ybsep(); +- ++ if (row_overlap) ++ { ++ // Copy the rows required to motion compensate the next row of ++ // blocks. This is usually Yblen-Ybsep rows. ++ memmove (pic_data[0], pic_data[save_from_row], (m_bparams.Yblen() - save_from_row)*pic_data.LengthX()*sizeof(ValueType)); ++ memset( pic_data[m_bparams.Yblen() - save_from_row], 0, save_from_row*pic_data.LengthX()*sizeof(ValueType) ); ++ save_from_row = m_bparams.Ybsep(); ++ } ++ else ++ { ++ // no row overlap. So reset pic_data to 0. ++ memset( pic_data[0], 0, m_bparams.Yblen()*pic_data.LengthX()*sizeof(ValueType) ); ++ } + }//yblock + + if ( m_add_or_sub == SUBTRACT) +-- +1.7.0.3 + diff --git a/dirac.changes b/dirac.changes index 9330254..fbdffb3 100644 --- a/dirac.changes +++ b/dirac.changes @@ -1,8 +1,14 @@ +------------------------------------------------------------------- +Mon May 24 13:25:36 UTC 2010 - davejplater@gmail.com + +- Split off doc subpackage + ------------------------------------------------------------------- Mon May 24 07:01:37 UTC 2010 - davejplater@gmail.com -- Added Provides: and Obsoletes: for packman libdirac-devel and - dirac-doc which are merged in openSUSE dirac-devel. +- Added Provides: and Obsoletes: for packman libdirac-devel +- Included patch from dirac git to fix uninitialised memory read + that causes the encoder to crash when using non-overlapping blocks. ------------------------------------------------------------------- Sun May 9 08:49:10 UTC 2010 - davejplater@gmail.com diff --git a/dirac.spec b/dirac.spec index ac61971..bd51699 100644 --- a/dirac.spec +++ b/dirac.spec @@ -24,9 +24,10 @@ Release: 4 Url: http://diracvideo.org/ Group: Productivity/Multimedia/Video/Editors and Convertors License: MPL .. -Summary: The dirac Video Codec +Summary: The Dirac_Video Codec Source: %{name}-%{version}.tar.bz2 -Patch0: %{name}-%{version}-gcc45.patch +Patch0: 0001-Fix-uninitialised-memory-read-that-causes-the-encode.patch +Patch1: %{name}-%{version}-gcc45.patch BuildRequires: gcc-c++ libstdc++-devel BuildRequires: libcppunit-devel %ifnarch ia64 s390 s390x %sparc @@ -166,10 +167,11 @@ Authors: License: MPL .. Group: Development/Libraries/C and C++ Summary: Development Files for Dirac Video Codec +AutoReqProv: on Requires: libdirac_decoder0 = %{version} Requires: libdirac_encoder0 = %{version} -Provides: libdirac-devel = %{version} dirac-doc = %{version} -Obsoletes: libdirac-devel <= %{version} dirac-doc <= %{version} +Provides: libdirac-devel = %{version}-%{release} +Obsoletes: libdirac-devel < %{version}-%{release} %description devel Dirac is an open source video codec. It uses a traditional hybrid video @@ -210,9 +212,22 @@ Authors: Peter Bleackley , BBC Research and Development Myo Tun , Brunel University +%package doc +License: MPL .. +Group: Documentation/HTML +Summary: Dirac Video Codec api documentation +%if 0%{?suse_version} > 1110 +BuildArch: noarch +%endif + +%description doc +This package provides the api reference documentation for using dirac libraries +in your program. + %prep %setup -q %patch0 -p1 +%patch1 -p1 # Code is not mature enough for -Werror (unused results) sed -i 's/-Werror//' configure.ac @@ -226,8 +241,10 @@ export CXXFLAGS="$RPM_OPT_FLAGS -O0" %endif %endif %configure\ - --disable-static -%{__make} %{?jobs:-j%jobs} htmldir=%{_docdir}/%{name}/code/api_html + --disable-static \ + --docdir=%{_docdir}/packages/%{name} +%{__make} %{?jobs:-j%jobs} +#htmldir=%{_docdir}/%{name}/code/api_html %install %makeinstall htmldir=%{_docdir}/%{name}/code/api_html @@ -248,8 +265,8 @@ export CXXFLAGS="$RPM_OPT_FLAGS -O0" %files %defattr (-, root, root) -%doc %dir %{_docdir}/%{name} -%doc %{_docdir}/%{name}/[ACNRT]* +#%%doc AUTHORS COPYING ChangeLog NEWS README TODO +#%%doc %{_docdir}/%{name}/[ACNRT]* %{_bindir}/* %files -n libdirac_decoder0 @@ -262,10 +279,15 @@ export CXXFLAGS="$RPM_OPT_FLAGS -O0" %files devel %defattr (-, root, root) -%doc %{_docdir}/%{name}/code +#%%doc %{_docdir}/%{name}/[ACNRT]* %{_libdir}/*.so #%{_libdir}/*.*a %{_libdir}/pkgconfig/*.pc -%{_includedir}/dirac +%{_includedir}/%{name} + +%files doc +%defattr (-, root, root) +%doc %{_docdir}/%{name} + %changelog From 70354524f5a55ba6c3ee7ea877cf17b6074a3febf7ec7d375d8abcb79d16be03 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Tue, 25 May 2010 12:10:02 +0000 Subject: [PATCH 12/13] Accepting request 40589 from multimedia:libs checked in (request 40589) OBS-URL: https://build.opensuse.org/request/show/40589 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/dirac?expand=0&rev=18 --- ...d-memory-read-that-causes-the-encode.patch | 52 ------------------- dirac.changes | 12 ----- dirac.spec | 40 +++----------- 3 files changed, 8 insertions(+), 96 deletions(-) delete mode 100644 0001-Fix-uninitialised-memory-read-that-causes-the-encode.patch diff --git a/0001-Fix-uninitialised-memory-read-that-causes-the-encode.patch b/0001-Fix-uninitialised-memory-read-that-causes-the-encode.patch deleted file mode 100644 index 0392ec5..0000000 --- a/0001-Fix-uninitialised-memory-read-that-causes-the-encode.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 88fae6224b54ecf92ac6e3ae5083c3f352adc798 Mon Sep 17 00:00:00 2001 -From: Anuradha Suraparaju -Date: Fri, 17 Apr 2009 17:47:27 +1000 -Subject: [PATCH] Fix uninitialised memory read that causes the encoder to crash when using - non-overlapping blocks. - ---- - libdirac_common/mot_comp.cpp | 21 +++++++++++++++------ - 1 files changed, 15 insertions(+), 6 deletions(-) - -diff --git a/libdirac_common/mot_comp.cpp b/libdirac_common/mot_comp.cpp -index aa8d37c..e0ec2ff 100644 ---- a/libdirac_common/mot_comp.cpp -+++ b/libdirac_common/mot_comp.cpp -@@ -306,6 +306,8 @@ void MotionCompensator::CompensateComponent( Picture* pic , - - int save_from_row = m_bparams.Ybsep()-m_bparams.Yoffset(); - -+ bool row_overlap = ((m_bparams.Yblen() - m_bparams.Ybsep()) > 0); -+ - // unpadded picture dimensions - const int x_end_data = pic_data_out.FirstX() + std::min(pic_data_out.LengthX(), pic_size.x ); - const int y_end_data = pic_data_out.FirstY() + std::min(pic_data_out.LengthY(), pic_size.y ); -@@ -489,12 +491,19 @@ void MotionCompensator::CompensateComponent( Picture* pic , - //Increment the block vertical position - pos.y += m_bparams.Ybsep(); - -- // Copy the rows required to motion compensate the next row of block. -- // This is usually Yblen-Ybsep rows. -- memmove (pic_data[0], pic_data[save_from_row], (m_bparams.Yblen() - save_from_row)*pic_data.LengthX()*sizeof(ValueType)); -- memset( pic_data[m_bparams.Yblen() - save_from_row], 0, save_from_row*pic_data.LengthX()*sizeof(ValueType) ); -- save_from_row = m_bparams.Ybsep(); -- -+ if (row_overlap) -+ { -+ // Copy the rows required to motion compensate the next row of -+ // blocks. This is usually Yblen-Ybsep rows. -+ memmove (pic_data[0], pic_data[save_from_row], (m_bparams.Yblen() - save_from_row)*pic_data.LengthX()*sizeof(ValueType)); -+ memset( pic_data[m_bparams.Yblen() - save_from_row], 0, save_from_row*pic_data.LengthX()*sizeof(ValueType) ); -+ save_from_row = m_bparams.Ybsep(); -+ } -+ else -+ { -+ // no row overlap. So reset pic_data to 0. -+ memset( pic_data[0], 0, m_bparams.Yblen()*pic_data.LengthX()*sizeof(ValueType) ); -+ } - }//yblock - - if ( m_add_or_sub == SUBTRACT) --- -1.7.0.3 - diff --git a/dirac.changes b/dirac.changes index fbdffb3..65278f8 100644 --- a/dirac.changes +++ b/dirac.changes @@ -1,15 +1,3 @@ -------------------------------------------------------------------- -Mon May 24 13:25:36 UTC 2010 - davejplater@gmail.com - -- Split off doc subpackage - -------------------------------------------------------------------- -Mon May 24 07:01:37 UTC 2010 - davejplater@gmail.com - -- Added Provides: and Obsoletes: for packman libdirac-devel -- Included patch from dirac git to fix uninitialised memory read - that causes the encoder to crash when using non-overlapping blocks. - ------------------------------------------------------------------- Sun May 9 08:49:10 UTC 2010 - davejplater@gmail.com diff --git a/dirac.spec b/dirac.spec index bd51699..c96879b 100644 --- a/dirac.spec +++ b/dirac.spec @@ -24,10 +24,9 @@ Release: 4 Url: http://diracvideo.org/ Group: Productivity/Multimedia/Video/Editors and Convertors License: MPL .. -Summary: The Dirac_Video Codec +Summary: The dirac Video Codec Source: %{name}-%{version}.tar.bz2 -Patch0: 0001-Fix-uninitialised-memory-read-that-causes-the-encode.patch -Patch1: %{name}-%{version}-gcc45.patch +Patch0: %{name}-%{version}-gcc45.patch BuildRequires: gcc-c++ libstdc++-devel BuildRequires: libcppunit-devel %ifnarch ia64 s390 s390x %sparc @@ -167,11 +166,8 @@ Authors: License: MPL .. Group: Development/Libraries/C and C++ Summary: Development Files for Dirac Video Codec -AutoReqProv: on Requires: libdirac_decoder0 = %{version} Requires: libdirac_encoder0 = %{version} -Provides: libdirac-devel = %{version}-%{release} -Obsoletes: libdirac-devel < %{version}-%{release} %description devel Dirac is an open source video codec. It uses a traditional hybrid video @@ -212,22 +208,9 @@ Authors: Peter Bleackley , BBC Research and Development Myo Tun , Brunel University -%package doc -License: MPL .. -Group: Documentation/HTML -Summary: Dirac Video Codec api documentation -%if 0%{?suse_version} > 1110 -BuildArch: noarch -%endif - -%description doc -This package provides the api reference documentation for using dirac libraries -in your program. - %prep %setup -q %patch0 -p1 -%patch1 -p1 # Code is not mature enough for -Werror (unused results) sed -i 's/-Werror//' configure.ac @@ -241,10 +224,8 @@ export CXXFLAGS="$RPM_OPT_FLAGS -O0" %endif %endif %configure\ - --disable-static \ - --docdir=%{_docdir}/packages/%{name} -%{__make} %{?jobs:-j%jobs} -#htmldir=%{_docdir}/%{name}/code/api_html + --disable-static +%{__make} %{?jobs:-j%jobs} htmldir=%{_docdir}/%{name}/code/api_html %install %makeinstall htmldir=%{_docdir}/%{name}/code/api_html @@ -265,8 +246,8 @@ export CXXFLAGS="$RPM_OPT_FLAGS -O0" %files %defattr (-, root, root) -#%%doc AUTHORS COPYING ChangeLog NEWS README TODO -#%%doc %{_docdir}/%{name}/[ACNRT]* +%doc %dir %{_docdir}/%{name} +%doc %{_docdir}/%{name}/[ACNRT]* %{_bindir}/* %files -n libdirac_decoder0 @@ -279,15 +260,10 @@ export CXXFLAGS="$RPM_OPT_FLAGS -O0" %files devel %defattr (-, root, root) -#%%doc %{_docdir}/%{name}/[ACNRT]* +%doc %{_docdir}/%{name}/code %{_libdir}/*.so #%{_libdir}/*.*a %{_libdir}/pkgconfig/*.pc -%{_includedir}/%{name} - -%files doc -%defattr (-, root, root) -%doc %{_docdir}/%{name} - +%{_includedir}/dirac %changelog From 1464880eb04995cf06a1975337add152e81cd55d2bbf1bcb64efff895d80d2c6 Mon Sep 17 00:00:00 2001 From: Dave Plater Date: Fri, 15 Apr 2011 19:18:32 +0000 Subject: [PATCH 13/13] Accepting request 67567 from home:TheBlackCat Would have been nice if you had fixed the unescaped macros then I could have forwarded to factory. OBS-URL: https://build.opensuse.org/request/show/67567 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/dirac?expand=0&rev=19 --- ...d-memory-read-that-causes-the-encode.patch | 52 +++++++++++++++++++ baselibs.conf | 2 + dirac.changes | 17 ++++++ dirac.spec | 41 +++++++++++---- 4 files changed, 103 insertions(+), 9 deletions(-) create mode 100644 0001-Fix-uninitialised-memory-read-that-causes-the-encode.patch create mode 100644 baselibs.conf diff --git a/0001-Fix-uninitialised-memory-read-that-causes-the-encode.patch b/0001-Fix-uninitialised-memory-read-that-causes-the-encode.patch new file mode 100644 index 0000000..0392ec5 --- /dev/null +++ b/0001-Fix-uninitialised-memory-read-that-causes-the-encode.patch @@ -0,0 +1,52 @@ +From 88fae6224b54ecf92ac6e3ae5083c3f352adc798 Mon Sep 17 00:00:00 2001 +From: Anuradha Suraparaju +Date: Fri, 17 Apr 2009 17:47:27 +1000 +Subject: [PATCH] Fix uninitialised memory read that causes the encoder to crash when using + non-overlapping blocks. + +--- + libdirac_common/mot_comp.cpp | 21 +++++++++++++++------ + 1 files changed, 15 insertions(+), 6 deletions(-) + +diff --git a/libdirac_common/mot_comp.cpp b/libdirac_common/mot_comp.cpp +index aa8d37c..e0ec2ff 100644 +--- a/libdirac_common/mot_comp.cpp ++++ b/libdirac_common/mot_comp.cpp +@@ -306,6 +306,8 @@ void MotionCompensator::CompensateComponent( Picture* pic , + + int save_from_row = m_bparams.Ybsep()-m_bparams.Yoffset(); + ++ bool row_overlap = ((m_bparams.Yblen() - m_bparams.Ybsep()) > 0); ++ + // unpadded picture dimensions + const int x_end_data = pic_data_out.FirstX() + std::min(pic_data_out.LengthX(), pic_size.x ); + const int y_end_data = pic_data_out.FirstY() + std::min(pic_data_out.LengthY(), pic_size.y ); +@@ -489,12 +491,19 @@ void MotionCompensator::CompensateComponent( Picture* pic , + //Increment the block vertical position + pos.y += m_bparams.Ybsep(); + +- // Copy the rows required to motion compensate the next row of block. +- // This is usually Yblen-Ybsep rows. +- memmove (pic_data[0], pic_data[save_from_row], (m_bparams.Yblen() - save_from_row)*pic_data.LengthX()*sizeof(ValueType)); +- memset( pic_data[m_bparams.Yblen() - save_from_row], 0, save_from_row*pic_data.LengthX()*sizeof(ValueType) ); +- save_from_row = m_bparams.Ybsep(); +- ++ if (row_overlap) ++ { ++ // Copy the rows required to motion compensate the next row of ++ // blocks. This is usually Yblen-Ybsep rows. ++ memmove (pic_data[0], pic_data[save_from_row], (m_bparams.Yblen() - save_from_row)*pic_data.LengthX()*sizeof(ValueType)); ++ memset( pic_data[m_bparams.Yblen() - save_from_row], 0, save_from_row*pic_data.LengthX()*sizeof(ValueType) ); ++ save_from_row = m_bparams.Ybsep(); ++ } ++ else ++ { ++ // no row overlap. So reset pic_data to 0. ++ memset( pic_data[0], 0, m_bparams.Yblen()*pic_data.LengthX()*sizeof(ValueType) ); ++ } + }//yblock + + if ( m_add_or_sub == SUBTRACT) +-- +1.7.0.3 + diff --git a/baselibs.conf b/baselibs.conf new file mode 100644 index 0000000..8de12d3 --- /dev/null +++ b/baselibs.conf @@ -0,0 +1,2 @@ +libdirac_decoder0 +libdirac_encoder0 diff --git a/dirac.changes b/dirac.changes index 65278f8..f8c49f3 100644 --- a/dirac.changes +++ b/dirac.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Fri Apr 14 13:38:21 UTC 2011 - toddrme2178@gmail.com + +- added 32bit compatibility libraries + +------------------------------------------------------------------- +Mon May 24 13:25:36 UTC 2010 - davejplater@gmail.com + +- Split off doc subpackage + +------------------------------------------------------------------- +Mon May 24 07:01:37 UTC 2010 - davejplater@gmail.com + +- Added Provides: and Obsoletes: for packman libdirac-devel +- Included patch from dirac git to fix uninitialised memory read + that causes the encoder to crash when using non-overlapping blocks. + ------------------------------------------------------------------- Sun May 9 08:49:10 UTC 2010 - davejplater@gmail.com diff --git a/dirac.spec b/dirac.spec index c96879b..8dbc5f5 100644 --- a/dirac.spec +++ b/dirac.spec @@ -20,13 +20,14 @@ Name: dirac Version: 1.0.2 -Release: 4 +Release: 5 Url: http://diracvideo.org/ Group: Productivity/Multimedia/Video/Editors and Convertors License: MPL .. -Summary: The dirac Video Codec +Summary: The Dirac_Video Codec Source: %{name}-%{version}.tar.bz2 -Patch0: %{name}-%{version}-gcc45.patch +Patch0: 0001-Fix-uninitialised-memory-read-that-causes-the-encode.patch +Patch1: %{name}-%{version}-gcc45.patch BuildRequires: gcc-c++ libstdc++-devel BuildRequires: libcppunit-devel %ifnarch ia64 s390 s390x %sparc @@ -166,8 +167,11 @@ Authors: License: MPL .. Group: Development/Libraries/C and C++ Summary: Development Files for Dirac Video Codec +AutoReqProv: on Requires: libdirac_decoder0 = %{version} Requires: libdirac_encoder0 = %{version} +Provides: libdirac-devel = %{version}-%{release} +Obsoletes: libdirac-devel < %{version}-%{release} %description devel Dirac is an open source video codec. It uses a traditional hybrid video @@ -208,9 +212,22 @@ Authors: Peter Bleackley , BBC Research and Development Myo Tun , Brunel University +%package doc +License: MPL .. +Group: Documentation/HTML +Summary: Dirac Video Codec api documentation +%if 0%{?suse_version} > 1110 +BuildArch: noarch +%endif + +%description doc +This package provides the api reference documentation for using dirac libraries +in your program. + %prep %setup -q %patch0 -p1 +%patch1 -p1 # Code is not mature enough for -Werror (unused results) sed -i 's/-Werror//' configure.ac @@ -224,8 +241,10 @@ export CXXFLAGS="$RPM_OPT_FLAGS -O0" %endif %endif %configure\ - --disable-static -%{__make} %{?jobs:-j%jobs} htmldir=%{_docdir}/%{name}/code/api_html + --disable-static \ + --docdir=%{_docdir}/packages/%{name} +%{__make} %{?jobs:-j%jobs} +#htmldir=%{_docdir}/%{name}/code/api_html %install %makeinstall htmldir=%{_docdir}/%{name}/code/api_html @@ -246,8 +265,8 @@ export CXXFLAGS="$RPM_OPT_FLAGS -O0" %files %defattr (-, root, root) -%doc %dir %{_docdir}/%{name} -%doc %{_docdir}/%{name}/[ACNRT]* +#%%doc AUTHORS COPYING ChangeLog NEWS README TODO +#%%doc %{_docdir}/%{name}/[ACNRT]* %{_bindir}/* %files -n libdirac_decoder0 @@ -260,10 +279,14 @@ export CXXFLAGS="$RPM_OPT_FLAGS -O0" %files devel %defattr (-, root, root) -%doc %{_docdir}/%{name}/code +#%%doc %{_docdir}/%{name}/[ACNRT]* %{_libdir}/*.so #%{_libdir}/*.*a %{_libdir}/pkgconfig/*.pc -%{_includedir}/dirac +%{_includedir}/%{name} + +%files doc +%defattr (-, root, root) +%doc %{_docdir}/%{name} %changelog