rpms/dirac/devel dirac-0.8.0-gcc43.patch, NONE, 1.1 dirac.spec, 1.6, 1.7
Chauvet (kwizart)
fedora-extras-commits at redhat.com
Fri Jan 4 20:29:02 UTC 2008
- Previous message (by thread): rpms/kbibtex/F-7 kbibtex-0.2-desktop-file-type.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 kbibtex.spec, 1.10, 1.11 sources, 1.5, 1.6
- Next message (by thread): rpms/sonata/devel sonata.spec,1.11,1.12
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: kwizart
Update of /cvs/pkgs/rpms/dirac/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4694
Modified Files:
dirac.spec
Added Files:
dirac-0.8.0-gcc43.patch
Log Message:
Fix for gcc43
dirac-0.8.0-gcc43.patch:
--- NEW FILE dirac-0.8.0-gcc43.patch ---
--- dirac/encoder/encmain.cpp.ark 2007-10-05 23:05:38.000000000 +0200
+++ dirac/encoder/encmain.cpp 2007-10-05 23:07:21.000000000 +0200
@@ -50,6 +50,9 @@
#include <ctime>
#include <cassert>
#include <string>
+#include <cstdlib> // EXIT_SUCCESS
+#include <cstring> // memset, strcmp
+#include <climits> // INT_MAX
#include <libdirac_encoder/dirac_encoder.h>
#include <sys/types.h>
#include <sys/stat.h>
--- dirac/libdirac_byteio/byteio.cpp.ark 2007-10-05 22:24:18.000000000 +0200
+++ dirac/libdirac_byteio/byteio.cpp 2007-10-05 22:25:06.000000000 +0200
@@ -37,6 +37,8 @@
* ***** END LICENSE BLOCK ***** */
#include <libdirac_byteio/byteio.h>
+#include <climits> // CHAR_BIT
+#include <cstdlib> // abs()
using namespace dirac;
using namespace std;
--- dirac/libdirac_byteio/dirac_byte_stats.cpp.ark 2007-10-05 22:27:06.000000000 +0200
+++ dirac/libdirac_byteio/dirac_byte_stats.cpp 2007-10-05 22:27:13.000000000 +0200
@@ -36,6 +36,7 @@
* ***** END LICENSE BLOCK ***** */
#include <libdirac_byteio/dirac_byte_stats.h>
+#include <climits> // CHAR_BIT
using namespace dirac;
using namespace std;
--- dirac/libdirac_common/arrays.h.ark 2007-10-05 22:17:03.000000000 +0200
+++ dirac/libdirac_common/arrays.h 2007-10-05 22:21:26.000000000 +0200
@@ -45,6 +45,7 @@
#include <memory>
#include <cstddef>
+#include <cstring> // memcpy
#include <stdexcept>
#include <iostream>
#include <algorithm>
@@ -66,10 +67,10 @@
Range(int s, int e): m_fst(s), m_lst(e){}
//! Returns the start of the range.
- const int First() const {return m_fst;}
+ int First() const {return m_fst;}
//! Returns the end point of the range.
- const int Last() const {return m_lst;}
+ int Last() const {return m_lst;}
private:
int m_fst ,m_lst;
@@ -358,22 +359,22 @@
inline const element_type& operator[](const int pos) const {return m_array_of_rows[pos];}
//! Returns the width
- const int LengthX() const { return m_length_x; }
+ int LengthX() const { return m_length_x; }
//! Returns the height
- const int LengthY() const { return m_length_y; }
+ int LengthY() const { return m_length_y; }
//! Returns the index of the first element of a row
- const int FirstX() const { return m_first_x; }
+ int FirstX() const { return m_first_x; }
//! Returns the index of the first element of a column
- const int FirstY() const { return m_first_y; }
+ int FirstY() const { return m_first_y; }
//! Returns the index of the last element of a row
- const int LastX() const { return m_last_x; }
+ int LastX() const { return m_last_x; }
//! Returns the index of the first element of a column
- const int LastY() const { return m_last_y; }
+ int LastY() const { return m_last_y; }
private:
//! Initialise the array
--- dirac/libdirac_common/cmd_line.cpp.ark 2007-10-05 22:34:28.000000000 +0200
+++ dirac/libdirac_common/cmd_line.cpp 2007-10-05 22:34:36.000000000 +0200
@@ -36,6 +36,7 @@
* ***** END LICENSE BLOCK ***** */
#include "cmd_line.h"
+#include <cstring> // strlen
using namespace dirac;
using namespace std;
--- dirac/libdirac_common/motion.h.ark 2007-10-05 22:31:08.000000000 +0200
+++ dirac/libdirac_common/motion.h 2007-10-05 22:31:11.000000000 +0200
@@ -283,7 +283,7 @@
const OneDArray<float>& GlobalMotionParameters(const int ref_id) const { return *( m_gm_params[ref_id] ); }
//! Return the number of reference frames
- const unsigned int NumRefs()const {return m_num_refs;}
+ unsigned int NumRefs()const {return m_num_refs;}
private:
// Initialises the arrays of data
--- dirac/libdirac_common/wavelet_utils_mmx.cpp.ark 2007-10-05 22:35:49.000000000 +0200
+++ dirac/libdirac_common/wavelet_utils_mmx.cpp 2007-10-05 22:36:11.000000000 +0200
@@ -228,7 +228,7 @@
PredictStepShift<2> predict;
__m64 pred_round = _mm_set_pi16 (1<<(2-1), 1<<(2-1), 1<<(2-1), 1<<(2-1));
- int xstop = xp + (xl>>2)<<2;
+ int xstop = (xp + (xl>>2))<<2;
// First lifting stage
// Top edge
@@ -525,7 +525,7 @@
// Next, do the vertical synthesis
int ymid = yp + yl/2;
- int xstop = xp + (xl>>2)<<2;
+ int xstop = (xp + (xl>>2))<<2;
// First lifting stage - odd samples
// bottom edge
CoeffType *out = coeff_data[ymid-1];
--- dirac/libdirac_motionest/me_utils.cpp.ark 2007-10-05 23:02:10.000000000 +0200
+++ dirac/libdirac_motionest/me_utils.cpp 2007-10-05 23:02:19.000000000 +0200
@@ -46,6 +46,7 @@
#include <libdirac_motionest/me_utils.h>
#include <libdirac_motionest/me_utils_mmx.h>
#include <libdirac_common/common.h>
+#include <climits> // INT_MAX
using namespace dirac;
--- dirac/libdirac_motionest/me_utils.h.ark 2007-10-05 22:37:53.000000000 +0200
+++ dirac/libdirac_motionest/me_utils.h 2007-10-05 22:38:26.000000000 +0200
@@ -83,22 +83,22 @@
// ... and gets
//! Return the x-position of the top-left block corner
- const int Xp() const {return m_xp;}
+ int Xp() const {return m_xp;}
//! Return the y-position of the top-left block corner
- const int Yp() const {return m_yp;}
+ int Yp() const {return m_yp;}
//! Return the block width
- const int Xl() const {return m_xl;}
+ int Xl() const {return m_xl;}
//! Return the block height
- const int Yl() const {return m_yl;}
+ int Yl() const {return m_yl;}
//! Return the block horizontal endpoint
- const int Xend() const {return m_xend;}
+ int Xend() const {return m_xend;}
//! Return the block vertical endpoint
- const int Yend() const {return m_yend;}
+ int Yend() const {return m_yend;}
private:
--- dirac/util/instrumentation/libdirac_instrument/draw_overlay.h.ark 2007-10-05 23:08:10.000000000 +0200
+++ dirac/util/instrumentation/libdirac_instrument/draw_overlay.h 2007-10-05 23:08:29.000000000 +0200
@@ -63,28 +63,28 @@
~DrawFrameMotionParams() {}
//! Gets...
//! Returns luma motion vector block height
- const int MvYBlockY() const {return m_mv_Y_block_y;}
+ int MvYBlockY() const {return m_mv_Y_block_y;}
//! Returns luma motion vector block width
- const int MvYBlockX() const {return m_mv_Y_block_x;}
+ int MvYBlockX() const {return m_mv_Y_block_x;}
//! Returns chroma motion vector height
- const int MvUVBlockY() const {return m_mv_UV_block_y;}
+ int MvUVBlockY() const {return m_mv_UV_block_y;}
//! Returns chroma motion vector width
- const int MvUVBlockX() const {return m_mv_UV_block_x;}
+ int MvUVBlockX() const {return m_mv_UV_block_x;}
//! Returns chroma - luma vertical smaple ratio
- const int ChromaFactorY() const {return m_chroma_factor_y;}
+ int ChromaFactorY() const {return m_chroma_factor_y;}
//! Returns chroma - luma horizontal sample ratio
- const int ChromaFactorX() const {return m_chroma_factor_x;}
+ int ChromaFactorX() const {return m_chroma_factor_x;}
//! Returns original picture height
- const int PicY() const {return m_pic_y;}
+ int PicY() const {return m_pic_y;}
//! Returns original picture width
- const int PicX() const {return m_pic_x;}
+ int PicX() const {return m_pic_x;}
//! Sets...
//! Set luma motion vector block height
--- dirac/util/instrumentation/libdirac_instrument/overlay.h.ark 2007-10-05 23:07:46.000000000 +0200
+++ dirac/util/instrumentation/libdirac_instrument/overlay.h 2007-10-05 23:07:58.000000000 +0200
@@ -80,22 +80,22 @@
//! Get functions...
//! Returns instrumentation command line option
- const OverlayOption Option() const {return m_option;}
+ OverlayOption Option() const {return m_option;}
//! Returns which reference is to be used
- const int Reference() const {return m_ref;}
+ int Reference() const {return m_ref;}
//! Returns true if input frame background is used, false if grey
- const int Background() const {return m_bg;}
+ int Background() const {return m_bg;}
//! Returns true if colour legend is displayed
- const int Legend() const {return m_legend;}
+ int Legend() const {return m_legend;}
//! Returns clip value for motion vectors
- const int MvClip() const {return m_mv_clip;}
+ int MvClip() const {return m_mv_clip;}
//! Returns clip value for sad
- const int SADClip() const {return m_sad_clip;}
+ int SADClip() const {return m_sad_clip;}
//! Set functions...
//! Set type of instrumentation
--- dirac/util/instrumentation/process_sequence.cpp.ark 2007-10-05 23:10:21.000000000 +0200
+++ dirac/util/instrumentation/process_sequence.cpp 2007-10-05 23:10:29.000000000 +0200
@@ -37,6 +37,7 @@
* ***** END LICENSE BLOCK ***** */
#include <limits>
+#include <climits> // INT_MAX
#include <util/instrumentation/process_sequence.h>
#include <libdirac_common/frame.h>
using namespace dirac;
Index: dirac.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dirac/devel/dirac.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- dirac.spec 10 Oct 2007 19:26:47 -0000 1.6
+++ dirac.spec 4 Jan 2008 20:28:22 -0000 1.7
@@ -1,19 +1,13 @@
-#define cvs 20070325
-
Name: dirac
Version: 0.8.0
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Dirac is an open source video codec
Group: System Environment/Libraries
License: MPLv1.1
URL: http://dirac.sourceforge.net/
-#cvs -z3 -d:pserver:anonymous at dirac.cvs.sourceforge.net:/cvsroot/dirac co -P compress
-#find . -type d -name CVS -print0 | xargs -0r rm -rf
-#autoreconf -fi && ./configure && make dist
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-#Source1: %{name}-%{version}-%{cvs}.tar.gz
-Source10: %{name}-snapshot.sh
+Patch0: dirac-0.8.0-gcc43.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: cppunit-devel
@@ -22,8 +16,6 @@
BuildRequires: libtool
BuildRequires: tetex-latex
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
%description
Dirac is an open source video codec. It uses a traditional hybrid video codec
@@ -56,7 +48,8 @@
%prep
-%setup -q
+%setup -q
+%patch0 -p1 -b .gcc43
install -m 644 README README.Dirac
install -m 644 util/instrumentation/README README.instrumentation
# fix permission mode for sources.
@@ -74,7 +67,7 @@
%build
-%configure CXXFLAGS="${RPM_OPT_FLAGS}" CFLAGS="${RPM_OPT_FLAGS}" \
+%configure \
--program-prefix=dirac_ \
--program-transform-name=s,dirac_dirac_,dirac_, \
--libdir=%{_libdir} \
@@ -146,6 +139,9 @@
%changelog
+* Fri Jan 4 2008 kwizart < kwizart at gmail.com > - 0.8.0-3
+- Fix gcc43
+
* Wed Oct 10 2007 kwizart < kwizart at gmail.com > - 0.8.0-2
- Fix perms
- Previous message (by thread): rpms/kbibtex/F-7 kbibtex-0.2-desktop-file-type.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 kbibtex.spec, 1.10, 1.11 sources, 1.5, 1.6
- Next message (by thread): rpms/sonata/devel sonata.spec,1.11,1.12
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list