OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 01-May-2009 11:20:12
Branch: HEAD Handle: 2009050110201100
Modified files:
openpkg-src/x264 x264.patch x264.spec
Log:
get rid of git(1) complains, fix FreeBSD build, upgrade to latest
version
Summary:
Revision Changes Path
1.2 +16 -2 openpkg-src/x264/x264.patch
1.7 +3 -2 openpkg-src/x264/x264.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/x264/x264.patch
============================================================================
$ cvs diff -u -r1.1 -r1.2 x264.patch
--- openpkg-src/x264/x264.patch 8 Mar 2009 11:18:29 -0000 1.1
+++ openpkg-src/x264/x264.patch 1 May 2009 09:20:11 -0000 1.2
@@ -1,6 +1,6 @@
Index: configure
---- configure.orig 2009-03-05 22:45:09 +0100
-+++ configure 2009-03-08 12:08:25 +0100
+--- configure.orig 2009-04-30 22:45:10 +0200
++++ configure 2009-05-01 11:08:33 +0200
@@ -244,7 +244,7 @@
ASFLAGS="$ASFLAGS -f elf"
fi
@@ -10,3 +10,17 @@
ARCH="X86_64"
AS="yasm"
if [ "$SYS" = MACOSX ];then
+Index: encoder/analyse.c
+--- encoder/analyse.c.orig 2009-04-30 22:45:10 +0200
++++ encoder/analyse.c 2009-05-01 11:14:38 +0200
+@@ -37,6 +37,10 @@
+ #include "analyse.h"
+ #include "rdo.c"
+
++#if defined(__FreeBSD__)
++#define log2f(x) (logf((x)) / logf(2))
++#endif
++
+ typedef struct
+ {
+ /* 16x16 */
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/x264/x264.spec
============================================================================
$ cvs diff -u -r1.6 -r1.7 x264.spec
--- openpkg-src/x264/x264.spec 18 Apr 2009 13:18:33 -0000 1.6
+++ openpkg-src/x264/x264.spec 1 May 2009 09:20:11 -0000 1.7
@@ -23,7 +23,7 @@
# package version
%define V_build 2245
-%define V_date 20090305
+%define V_date 20090430
# package information
Name: x264
@@ -36,7 +36,7 @@
Group: Video
License: GPL
Version: %{V_build}
-Release: 20090308
+Release: 20090501
# list of sources
Source0:
ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-%{V_date}-%{V_build}.tar.bz2
@@ -69,6 +69,7 @@
%build
%{l_shtool} subst \
-e 's;/bin/bash;%{l_bash};g' \
+ -e 's;git;false;g' \
version.sh
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O}" \
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
