* Sun Jun 20 2010 Dominik Mierzejewski <rpm@greysector.net> 0.0.0-0.28.20100620git20cbe10

- 20100620 snapshot (ABI bump)
el8
Dominik Mierzejewski 15 years ago
parent 955614bdbc
commit 384c2947e6

2
.gitignore vendored

@ -1 +1 @@
x264-20100429.tar.bz2
x264-20100620.tar.bz2

@ -1 +1 @@
13601402b1e247e65d886f77903c14f7 x264-20100429.tar.bz2
eef8675f3f7e3d318fc1a5fbfd8c154a x264-20100620.tar.bz2

@ -1,21 +1,12 @@
diff -up x264-20100209/configure.nover x264-20100209/configure
--- x264-20100209/configure.nover 2010-02-09 21:33:25.000000000 +0100
+++ x264-20100209/configure 2010-02-09 22:20:35.000000000 +0100
@@ -103,7 +103,7 @@ die() {
exit 1
}
-rm -f config.h config.mak config.log x264.pc conftest*
+rm -f config.mak config.log x264.pc conftest*
prefix='/usr/local'
exec_prefix='${prefix}'
@@ -667,8 +667,6 @@ if [ "$shared" = "yes" ]; then
diff -up x264-20100620/configure.nover x264-20100620/configure
--- x264-20100620/configure.nover 2010-06-20 00:07:41.000000000 +0200
+++ x264-20100620/configure 2010-06-20 00:11:53.000000000 +0200
@@ -689,7 +689,7 @@ if [ "$shared" = "yes" ]; then
echo 'default: $(SONAME)' >> config.mak
fi
-./version.sh
-
-./version.sh >> config.h
+cat version.h >> config.h
pclibs="-L$libdir -lx264 $libpthread"
cat > x264.pc << EOF

@ -1,7 +1,7 @@
diff -up x264-20100116/configure.shared x264-20100116/configure
--- x264-20100116/configure.shared 2010-01-16 13:48:11.000000000 +0100
+++ x264-20100116/configure 2010-01-16 13:53:15.000000000 +0100
@@ -559,7 +559,7 @@ if [ "$shared" = "yes" ]; then
diff -up x264-20100620/configure.shared x264-20100620/configure
--- x264-20100620/configure.shared 2010-06-20 00:13:02.000000000 +0200
+++ x264-20100620/configure 2010-06-20 00:13:31.000000000 +0200
@@ -686,7 +686,7 @@ if [ "$shared" = "yes" ]; then
echo "SONAME=libx264.so.$API" >> config.mak
echo 'SOFLAGS=-Wl,-soname,$(SONAME)' >> config.mak
fi
@ -9,11 +9,11 @@ diff -up x264-20100116/configure.shared x264-20100116/configure
+ echo 'default: libx264.a $(SONAME)' >> config.mak
fi
pclibs="-L$libdir -lx264 $libpthread"
diff -up x264-20100116/Makefile.shared x264-20100116/Makefile
--- x264-20100116/Makefile.shared 2010-01-16 13:45:48.000000000 +0100
+++ x264-20100116/Makefile 2010-01-16 13:52:55.000000000 +0100
@@ -105,6 +105,9 @@ ifneq ($(SONAME),)
cat version.h >> config.h
diff -up x264-20100620/Makefile.shared x264-20100620/Makefile
--- x264-20100620/Makefile.shared 2010-06-20 00:12:43.000000000 +0200
+++ x264-20100620/Makefile 2010-06-20 00:13:02.000000000 +0200
@@ -109,6 +109,9 @@ ifneq ($(SONAME),)
ifeq ($(SYS),MINGW)
SRCSO += x264dll.c
endif
@ -23,7 +23,7 @@ diff -up x264-20100116/Makefile.shared x264-20100116/Makefile
endif
OBJS = $(SRCS:%.c=%.o)
@@ -123,7 +126,7 @@ libx264.a: .depend $(OBJS) $(OBJASM)
@@ -127,7 +130,7 @@ libx264.a: .depend $(OBJS) $(OBJASM)
$(SONAME): .depend $(OBJS) $(OBJASM) $(OBJSO)
$(CC) -shared -o $@ $(OBJS) $(OBJASM) $(OBJSO) $(SOFLAGS) $(LDFLAGS)

@ -1,10 +1,10 @@
%global snapshot 20100429
%global git d9db8b3
%global snapshot 20100620
%global git 20cbe10
Summary: H264/AVC video streams encoder
Name: x264
Version: 0.0.0
Release: 0.27.%{snapshot}git%{git}%{?dist}
Release: 0.28.%{snapshot}git%{git}%{?dist}
License: GPLv2+
Group: System Environment/Libraries
URL: http://developers.videolan.org/x264.html
@ -141,6 +141,9 @@ popd
%endif
%changelog
* Sun Jun 20 2010 Dominik Mierzejewski <rpm@greysector.net> 0.0.0-0.28.20100620git20cbe10
- 20100620 snapshot (ABI bump)
* Thu Apr 29 2010 Dominik Mierzejewski <rpm@greysector.net> 0.0.0-0.27.20100429gitd9db8b3
- 20100429 snapshot
- s/%%{ix86}/i686 (rfbz #1075)

Loading…
Cancel
Save