2007-11-20 Damien Carbery <[email protected]>
authordaymobrew
Tue, 20 Nov 2007 14:30:02 +0000
changeset 669 83999b072fc5
parent 668 9b4190da8d04
child 670 cb1c98a174c6
2007-11-20 Damien Carbery <[email protected]> * patches/libdv-01-solaris.diff: Add chunk to define __attribute__. * base-specs/libdv.spec: Change LDFLAGS to work for gcc. * SFElibx264.spec: Bump to 20071119 and add Url. * patches/libx264-01-gccisms.diff: Add chunk to define __attribute__.
ChangeLog
SFElibx264.spec
base-specs/libdv.spec
patches/libdv-01-solaris.diff
patches/libx264-01-gccisms.diff
--- a/ChangeLog	Tue Nov 20 09:44:52 2007 +0000
+++ b/ChangeLog	Tue Nov 20 14:30:02 2007 +0000
@@ -1,25 +1,19 @@
+2007-11-20  Damien Carbery <[email protected]>
+
+	* patches/libdv-01-solaris.diff: Add chunk to define __attribute__.
+	* base-specs/libdv.spec: Change LDFLAGS to work for gcc.
+	* SFElibx264.spec: Bump to 20071119 and add Url.
+	* patches/libx264-01-gccisms.diff: Add chunk to define __attribute__.
+
 2007-11-20  Halton Huo <[email protected]>
 
-        Add Owner
-	* SFEanjuta.spec:
-	* SFEaria.spec:
-	* SFEfilezilla.spec:
-	* SFEgdl.spec:
-	* SFEgnome-build.spec:
-	* SFElibgsf.spec:
-	* SFEtracker.spec:
-	* SFEvnc2swf.spec:
-	* SFEw3m.spec:
-	* SUNWgnome-sync.spec:
-	* base-specs/filezilla.spec:
-	* base-specs/gdl.spec:
-	* base-specs/gio.spec:
-	* base-specs/gnome-build.spec:
-	* base-specs/gnome-sync.spec:
-	* base-specs/gtk-vnc.spec:
-	* base-specs/libgsf.spec:
-	* base-specs/tracker.spec:
-	* base-specs/vnc2swf.spec:
+	* SFEanjuta.spec, SFEaria.spec, SFEfilezilla.spec, SFEgdl.spec,
+	  SFEgnome-build.spec, SFElibgsf.spec, SFEtracker.spec, SFEvnc2swf.spec,
+	  SFEw3m.spec, SUNWgnome-sync.spec, base-specs/filezilla.spec,
+	  base-specs/gdl.spec, base-specs/gio.spec, base-specs/gnome-build.spec,
+	  base-specs/gnome-sync.spec, base-specs/gtk-vnc.spec,
+	  base-specs/libgsf.spec, base-specs/tracker.spec,
+	  base-specs/vnc2swf.spec: Add Owner.
 
 2007-11-19  Damien Carbery <[email protected]>
 
--- a/SFElibx264.spec	Tue Nov 20 09:44:52 2007 +0000
+++ b/SFElibx264.spec	Tue Nov 20 14:30:02 2007 +0000
@@ -6,7 +6,7 @@
 
 %include Solaris.inc
 
-%define         snap    20070728
+%define         snap    20071119
 %define         snaph   2245
 %define src_name x264-snapshot
 %define src_url	 ftp://ftp.videolan.org/pub/videolan/x264/snapshots
@@ -15,6 +15,7 @@
 Summary:                 H264 encoder library
 Version:                 20070728
 Source:                  %{src_url}/%{src_name}-%{snap}-%{snaph}.tar.bz2
+URL:                     http://www.videolan.org/developers/x264.html
 Patch1:			 libx264-01-gccisms.diff
 SUNW_BaseDir:            %{_basedir}
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
@@ -103,6 +104,8 @@
 %endif
 
 %changelog
+* Tue Nov 20 2007 - [email protected]
+- Bump to 20071119 and add Url.
 * Sun Aug 12 2007 - [email protected]
 - Added SFEgpac as Required
 * Fri Aug  3 2007 - [email protected]
--- a/base-specs/libdv.spec	Tue Nov 20 09:44:52 2007 +0000
+++ b/base-specs/libdv.spec	Tue Nov 20 14:30:02 2007 +0000
@@ -26,8 +26,8 @@
 fi
 
 export CPPFLAGS="-I/usr/X11/include"
-export CFLAGS="-O4 -fPIC"
-export LDFLAGS="%_ldflags"
+export CFLAGS="%optflags"
+export LDFLAGS="%arch_ldadd %ldadd ${EXTRA_LDFLAGS}"
 
 if $( echo "%{_libdir}" | /usr/xpg4/bin/grep -q %{_arch64} ) ; then
         export CFLAGS="$CFLAGS -m64"
@@ -64,5 +64,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Tue Nov 20 2007 - [email protected]
+- Change LDFLAGS to work for gcc.
 * Thu Aug 30 2007 - [email protected]
 - Initial base spec file
--- a/patches/libdv-01-solaris.diff	Tue Nov 20 09:44:52 2007 +0000
+++ b/patches/libdv-01-solaris.diff	Tue Nov 20 14:30:02 2007 +0000
@@ -222,3 +222,16 @@
  
  .SUFFIXES:
 Only in libdv-1.0.0/playdv: Makefile.in~
+--- libdv-1.0.0/libdv/encode.c.orig	2007-11-20 14:11:13.080303000 +0000
++++ libdv-1.0.0/libdv/encode.c	2007-11-20 14:13:18.193892000 +0000
+@@ -73,6 +73,10 @@
+ #define VLC_BITS_ON_FULL_MBLOCK_CYCLE_QUANT_3 500
+ #define VLC_MAX_RUNS_PER_CYCLE_QUANT_3        3
+ 
++#ifndef __attribute__
++#define __attribute__(X)
++#endif
++
+ /* typedef unsigned long dv_vlc_entry_t; */
+ typedef uint32_t dv_vlc_entry_t;
+ 
--- a/patches/libx264-01-gccisms.diff	Tue Nov 20 09:44:52 2007 +0000
+++ b/patches/libx264-01-gccisms.diff	Tue Nov 20 14:30:02 2007 +0000
@@ -84,3 +84,16 @@
  
  # Program : test
  $(TEST_BIN): $(OBJECTS_LIB) $(OBJECTS_TEST)
+--- x264-snapshot-20070728-2245/common/osdep.h.orig	2007-11-20 11:47:58.841997000 +0000
++++ x264-snapshot-20070728-2245/common/osdep.h	2007-11-20 11:50:02.449417000 +0000
+@@ -57,6 +57,10 @@
+ #endif
+ #endif
+ 
++#ifndef __attribute__
++#define __attribute__(X)
++#endif
++
+ #ifdef _MSC_VER
+ #define DECLARE_ALIGNED( type, var, n ) __declspec(align(n)) type var
+ #else