1 diff -ru x264/Makefile x264.solaris/Makefile
2 --- x264/Makefile Mon Jun 9 01:36:08 2008
3 +++ x264.solaris/Makefile Thu Jun 19 11:54:53 2008
5 $(MAKE) -C gtk distclean
7 install: x264$(EXE) $(SONAME)
8 - install -d $(DESTDIR)$(bindir) $(DESTDIR)$(includedir)
9 - install -d $(DESTDIR)$(libdir) $(DESTDIR)$(libdir)/pkgconfig
10 + install -d $(DESTDIR)$(bindir)
11 + install -d $(DESTDIR)$(includedir)
12 + install -d $(DESTDIR)$(libdir)
13 + install -d $(DESTDIR)$(libdir)/pkgconfig
14 install -m 644 x264.h $(DESTDIR)$(includedir)
15 install -m 644 libx264.a $(DESTDIR)$(libdir)
16 install -m 644 x264.pc $(DESTDIR)$(libdir)/pkgconfig
17 diff -ru x264/configure x264.solaris/configure
18 --- x264/configure Tue Aug 12 03:26:58 2008
19 +++ x264.modified/configure Tue Aug 19 16:09:32 2008
24 if test x"$1" = x"-h" -o x"$1" = x"--help" ; then
27 # check whether 'echo -n' works as expected, otherwise try printf
28 if [ "x`echo -n houba`" = xhouba ]
31 + ECHON="/usr/ucb/echo -n"
32 elif [ "x`printf houba`" = xhouba ]
36 echo "If you really want to compile without asm, configure with --disable-asm."
43 CFLAGS="$CFLAGS -DARCH_$ARCH -DSYS_$SYS"
46 echo "unsigned int endian = 'B' << 24 | 'I' << 16 | 'G' << 8 | 'E';" > conftest.c
47 $CC $CFLAGS conftest.c -c -o conftest.o 2>$DEVNULL || die "endian test failed"
48 -grep -q BIGE conftest.o && CFLAGS="$CFLAGS -DWORDS_BIGENDIAN"
49 +/usr/bin/tr -cd "BIGE" < conftest.o | /usr/xpg4/bin/grep -q BIGE && CFLAGS="$CFLAGS -DWORDS_BIGENDIAN"
53 # autodetect options that weren't forced nor disabled
56 diff -ru x264/version.sh x264.solaris/version.sh
57 --- x264/version.sh Mon Jun 9 01:36:08 2008
58 +++ x264.solaris/version.sh Thu Jun 19 11:56:19 2008
61 git-rev-list HEAD | sort > config.git-hash
62 LOCALVER=`wc -l config.git-hash | awk '{print $1}'`
63 -if [ $LOCALVER \> 1 ] ; then
64 +if [ $LOCALVER -gt 1 ] ; then
65 VER=`git-rev-list origin/master | sort | join config.git-hash - | wc -l | awk '{print $1}'`
66 if [ $VER != $LOCALVER ] ; then
67 VER="$VER+$(($LOCALVER-$VER))"
68 diff -ru x264/common/osdep.h x264.solaris/common/osdep.h
69 --- x264/common/osdep.h Mon Jun 9 01:36:08 2008
70 +++ x264.solaris/common/osdep.h Thu Jun 19 10:52:56 2008
72 #define X264_VERSION "" // no configure script for msvc
75 +#if defined(SYS_SunOS)
76 +#define isfinite _finite
80 #define isfinite finite