diff options
| author | Jay Freeman <saurik@saurik.com> | 2008-04-06 10:28:29 +0000 |
|---|---|---|
| committer | Jay Freeman <saurik@saurik.com> | 2008-04-06 10:28:29 +0000 |
| commit | d699a01fabaa04a1aad60f6ca5777f82ee24839a (patch) | |
| tree | 1eb62bad23b14a0877c5b9171f2a5f9358c8d592 /data/x264 | |
| parent | 8a49e427447f40fdd43fc4b5f513b166dd639e2a (diff) | |
Drastic, sweeping modifications to support iPhone 1.2.0/2.0.
git-svn-id: http://svn.telesphoreo.org/trunk@199 514c082c-b64e-11dc-b46d-3d985efe055d
Diffstat (limited to 'data/x264')
| -rw-r--r-- | data/x264/assembly.diff | 14 | ||||
| -rw-r--r-- | data/x264/make.sh | 2 | ||||
| -rw-r--r-- | data/x264/optimizer.diff | 12 | ||||
| -rw-r--r-- | data/x264/tools.diff | 6 |
4 files changed, 18 insertions, 16 deletions
diff --git a/data/x264/assembly.diff b/data/x264/assembly.diff new file mode 100644 index 000000000..c049f3f5c --- /dev/null +++ b/data/x264/assembly.diff @@ -0,0 +1,14 @@ +diff -ru x264-snapshot-20080226-2245/configure x264-snapshot-20080226-2245+iPhone/configure +--- x264-snapshot-20080226-2245/configure 2008-02-26 21:45:02.000000000 +0000 ++++ x264-snapshot-20080226-2245+iPhone/configure 2008-03-20 19:56:40.000000000 +0000 +@@ -400,8 +400,8 @@ + fi + + if [ "$debug" != "yes" -a "$gprof" != "yes" ]; then +- CFLAGS="$CFLAGS -s -fomit-frame-pointer" +- LDFLAGS="$LDFLAGS -s" ++ CFLAGS="$CFLAGS -fomit-frame-pointer" ++ LDFLAGS="$LDFLAGS" + fi + + if [ "$debug" = "yes" ]; then diff --git a/data/x264/make.sh b/data/x264/make.sh index fc5616b2b..96731bd62 100644 --- a/data/x264/make.sh +++ b/data/x264/make.sh @@ -1,6 +1,6 @@ pkg:extract cd * pkg:patch -CC=arm-apple-darwin-gcc pkg:configure +CC=${PKG_TARG}-gcc pkg:configure make pkg:install diff --git a/data/x264/optimizer.diff b/data/x264/optimizer.diff deleted file mode 100644 index ca6e8441c..000000000 --- a/data/x264/optimizer.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru x264-snapshot-20080226-2245/configure x264-snapshot-20080226-2245+iPhone/configure ---- x264-snapshot-20080226-2245/configure 2008-02-26 21:45:02.000000000 +0000 -+++ x264-snapshot-20080226-2245+iPhone/configure 2008-02-27 08:09:51.000000000 +0000 -@@ -407,7 +407,7 @@ - if [ "$debug" = "yes" ]; then - CFLAGS="-O1 -g $CFLAGS" - else -- CFLAGS="-O4 -ffast-math $CFLAGS" -+ CFLAGS="-O3 -ffast-math $CFLAGS" - fi - - if cc_check "stdio.h" "" "fseeko(stdin,0,0);" ; then diff --git a/data/x264/tools.diff b/data/x264/tools.diff index 722e26e85..2974dbb44 100644 --- a/data/x264/tools.diff +++ b/data/x264/tools.diff @@ -7,8 +7,8 @@ diff -ru x264-snapshot-20080226-2245/Makefile x264-snapshot-20080226-2245+iPhone libx264.a: .depend $(OBJS) $(OBJASM) - ar rc libx264.a $(OBJS) $(OBJASM) - ranlib libx264.a -+ arm-apple-darwin-ar rc libx264.a $(OBJS) $(OBJASM) -+ arm-apple-darwin-ranlib libx264.a ++ "$${PKG_TARG}-ar" rc libx264.a $(OBJS) $(OBJASM) ++ "$${PKG_TARG}-ranlib" libx264.a $(SONAME): .depend $(OBJS) $(OBJASM) $(CC) -shared -o $@ $(OBJS) $(OBJASM) -Wl,-soname,$(SONAME) $(LDFLAGS) @@ -17,7 +17,7 @@ diff -ru x264-snapshot-20080226-2245/Makefile x264-snapshot-20080226-2245+iPhone install -m 644 x264.pc $(DESTDIR)$(libdir)/pkgconfig install x264 $(DESTDIR)$(bindir) - ranlib $(DESTDIR)$(libdir)/libx264.a -+ arm-apple-darwin-ranlib $(DESTDIR)$(libdir)/libx264.a ++ "$${PKG_TARG}-ranlib" $(DESTDIR)$(libdir)/libx264.a $(if $(SONAME), ln -sf $(SONAME) $(DESTDIR)$(libdir)/libx264.so) $(if $(SONAME), install -m 755 $(SONAME) $(DESTDIR)$(libdir)) |