--- a/base-specs/libx264.spec	Thu Sep 01 17:26:59 2011 +0000
+++ b/base-specs/libx264.spec	Thu Sep 01 18:49:56 2011 +0000
@@ -15,8 +15,7 @@
 Source:                  %src_url/%src_name-%snap-%snaph.tar.bz2
 Source1:                 libx264-replacement-version.sh
 URL:                     http://www.videolan.org/developers/x264.html
-#Patch1:	         libx264-01-gccisms.diff
-#Patch2:                 libx264-02-version.diff
+Patch2:                 libx264-02-version.diff
 #Patch3:                 libx264-03-ld.diff
 #Patch4:                 libx264-04-ginstall.diff
 #Patch5:                 libx264-05-ssse3.diff
@@ -27,13 +26,10 @@
 %prep
 %setup -q -n %src_name-%snap-%snaph
 
-# replaces patch2 libx264-02-version.diff
-cp %SOURCE1 version.sh
 
 #unused
 #%patch1 -p1
-#obsoleted by Source1
-#%patch2 -p1
+%patch2 -p1
 #obsolete
 #%patch3 -p1
 #obsolete 
@@ -84,6 +80,8 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Thu Sep 01 2011 - Milan Jurik
+- fix version.sh
 * Sun Aug 28 2011 - Alex Viskovatoff
 - update to new tarball
 * Fri Jul 15 2011 - Alex Viskovatoff

--- a/ext-sources/libx264-replacement-version.sh	Thu Sep 01 17:26:59 2011 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-#!/bin/bash
-VER="git-2245M"
-     echo "#define X264_VERSION \" r$VER\"" >> config.h
-API=`grep '#define X264_BUILD' < x264.h | sed -e 's/.* \([1-9][0-9]*\).*/\1/'`
-echo "#define X264_POINTVER \"0.$API.$VER\"" >> config.h

--- a/patches/libx264-01-gccisms.diff	Thu Sep 01 17:26:59 2011 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,99 +0,0 @@
-diff -ur x264-snapshot-20070728-2245.orig/Makefile x264-snapshot-20070728-2245/Makefile
---- x264-snapshot-20070728-2245.orig/Makefile	2007-07-29 03:45:02.000000000 +0700
-+++ x264-snapshot-20070728-2245/Makefile	2007-07-30 13:47:30.344498720 +0700
-@@ -70,14 +70,14 @@
- .PHONY: all default fprofiled clean distclean install install-gtk uninstall dox test testclean
- all: default
- 
--default: $(DEP) x264$(EXE)
-+default: x264$(EXE)
- 
--libx264.a: .depend $(OBJS) $(OBJASM)
-+libx264.a: $(OBJS) $(OBJASM)
- 	ar rc libx264.a $(OBJS) $(OBJASM)
- 	ranlib libx264.a
- 
--$(SONAME): .depend $(OBJS) $(OBJASM)
--	$(CC) -shared -o $@ $(OBJS) $(OBJASM) -Wl,-soname,$(SONAME) $(LDFLAGS)
-+$(SONAME): $(OBJS) $(OBJASM)
-+	$(CC) -Wl,-G -o $@ $(OBJS) $(OBJASM) -Wl,-h,$(SONAME) $(LDFLAGS)
- 
- x264$(EXE): $(OBJCLI) libx264.a 
- 	$(CC) -o $@ $+ $(LDFLAGS)
-@@ -98,7 +98,7 @@
- .depend: config.mak
- 	rm -f .depend
- # Hacky - because gcc 2.9x doesn't have -MT
--	$(foreach SRC, $(SRCS) $(SRCCLI), ( $(ECHON) "`dirname $(SRC)`/" && $(CC) $(CFLAGS) $(ALTIVECFLAGS) $(SRC) -MM -g0 ) 1>> .depend;)
-+	$(foreach SRC, $(SRCS) $(SRCCLI), ( $(ECHON) "`dirname $(SRC)`/" && $(CC) $(CFLAGS) $(ALTIVECFLAGS) $(SRC) -MM -g ) 1>> .depend;)
- 
- config.mak: $(wildcard .svn/entries */.svn/entries */*/.svn/entries)
- 	./configure $(CONFIGURE_ARGS)
-diff -ur x264-snapshot-20070728-2245.orig/configure x264-snapshot-20070728-2245/configure
---- x264-snapshot-20070728-2245.orig/configure	2007-07-29 03:45:02.000000000 +0700
-+++ x264-snapshot-20070728-2245/configure	2007-07-30 13:39:52.152858196 +0700
-@@ -64,7 +64,7 @@
- shared="no"
- 
- CC="${CC-gcc}"
--CFLAGS="$CFLAGS -Wall -I."
-+CFLAGS="$CFLAGS -I."
- LDFLAGS="$LDFLAGS"
- HAVE_GETOPT_LONG=1
- 
-@@ -346,7 +346,7 @@
-     LDFLAGS="$LDFLAGS $libpthread"
- fi
- 
--MP4_LDFLAGS="-lgpac_static"
-+MP4_LDFLAGS="-lgpac"
- if [ $SYS = CYGWIN -o $SYS = MINGW ]; then
-     MP4_LDFLAGS="$MP4_LDFLAGS -lwinmm"
- fi
-@@ -372,21 +372,9 @@
- fi
- 
- if [ "$pic" = "yes" ] ; then
--    CFLAGS="$CFLAGS -fPIC"
-     ASFLAGS="$ASFLAGS -D__PIC__"
- fi
- 
--if [ "$debug" != "yes" -a "$gprof" != "yes" ]; then
--    CFLAGS="$CFLAGS -s -fomit-frame-pointer"
--    LDFLAGS="$LDFLAGS -s"
--fi
--
--if [ "$debug" = "yes" ]; then
--    CFLAGS="-O1 -g $CFLAGS"
--else
--    CFLAGS="-O4 -ffast-math $CFLAGS"
--fi
--
- if cc_check "stdio.h" "" "fseeko(stdin,0,0);" ; then
-     echo "#define fseek fseeko" >> config.h
-     echo "#define ftell ftello" >> config.h
-diff -ur x264-snapshot-20070728-2245.orig/gtk/Makefile x264-snapshot-20070728-2245/gtk/Makefile
---- x264-snapshot-20070728-2245.orig/gtk/Makefile	2007-07-29 03:45:02.000000000 +0700
-+++ x264-snapshot-20070728-2245/gtk/Makefile	2007-07-30 13:41:26.113312450 +0700
-@@ -93,7 +93,7 @@
- 
- $(SONAMEGTK): $(OBJECTS_LIB)
- 	@echo "  L: $(@F)"
--	@$(CC) -shared -o $@ $(OBJECTS_LIB) -Wl,-soname,$(SONAMEGTK) $(LDFLAGS)
-+	@$(CC) -Wl,-G -o $@ $(OBJECTS_LIB) -Wl,-h,$(SONAMEGTK) $(LDFLAGS)
- 
- # 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

--- a/patches/libx264-02-version.diff	Thu Sep 01 17:26:59 2011 +0000
+++ b/patches/libx264-02-version.diff	Thu Sep 01 18:49:56 2011 +0000
@@ -1,5 +1,5 @@
---- x264-snapshot-20101029-2245/version.sh.orig	Fri Oct 29 16:45:07 2010
-+++ x264-snapshot-20101029-2245/version.sh	Fri Oct 29 22:40:36 2010
+--- x264-snapshot-20110827-2245/version.sh	2011-09-01 20:19:22.418374638 +0200
++++ x264-snapshot-20110827-2245/version.sh	2011-09-01 20:18:52.652811257 +0200
 @@ -1,20 +1,5 @@
  #!/bin/bash
 -git rev-list HEAD | sort > config.git-hash
@@ -15,12 +15,10 @@
 -    VER="$VER $(git rev-list HEAD -n 1 | cut -c 1-7)"
 -    echo "#define X264_VERSION \" r$VER\""
 -else
--    echo "#define X264_VERSION \"\""
++VER="git-2245M"
+     echo "#define X264_VERSION \"\""
 -    VER="x"
 -fi
 -rm -f config.git-hash
-+VER="git-2245M"
-+    echo "#define X264_VERSION \" r$VER\"" >> config.h
  API=`grep '#define X264_BUILD' < x264.h | sed -e 's/.* \([1-9][0-9]*\).*/\1/'`
--echo "#define X264_POINTVER \"0.$API.$VER\""
-+echo "#define X264_POINTVER \"0.$API.$VER\"" >> config.h
+ echo "#define X264_POINTVER \"0.$API.$VER\""