summaryrefslogtreecommitdiffstats
path: root/contrib/patch-x264-solaris.patch
blob: 9ed0eea34246111621b818bfce40b4f93587474d (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
diff -ru x264/Makefile x264.solaris/Makefile
--- x264/Makefile	Mon Jun  9 01:36:08 2008
+++ x264.solaris/Makefile	Thu Jun 19 11:54:53 2008
@@ -150,8 +150,10 @@
 	$(MAKE) -C gtk distclean
 
 install: x264$(EXE) $(SONAME)
-	install -d $(DESTDIR)$(bindir) $(DESTDIR)$(includedir)
-	install -d $(DESTDIR)$(libdir) $(DESTDIR)$(libdir)/pkgconfig
+	install -d $(DESTDIR)$(bindir) 
+	install -d $(DESTDIR)$(includedir)
+	install -d $(DESTDIR)$(libdir) 
+	install -d $(DESTDIR)$(libdir)/pkgconfig
 	install -m 644 x264.h $(DESTDIR)$(includedir)
 	install -m 644 libx264.a $(DESTDIR)$(libdir)
 	install -m 644 x264.pc $(DESTDIR)$(libdir)/pkgconfig
diff -ru x264/configure x264.solaris/configure
--- x264/configure	Tue Aug 12 03:26:58 2008
+++ x264.modified/configure	Tue Aug 19 16:09:32 2008
@@ -1,4 +1,4 @@
-#! /bin/sh
+#! /usr/xpg4/bin/sh
 
 if test x"$1" = x"-h" -o x"$1" = x"--help" ; then
 
@@ -75,7 +75,7 @@
 # check whether 'echo -n' works as expected, otherwise try printf
 if [ "x`echo -n houba`" = xhouba ]
 then
-  ECHON="echo -n"
+  ECHON="/usr/ucb/echo -n"
 elif [ "x`printf houba`" = xhouba ]
 then
   ECHON="printf"
@@ -321,8 +321,6 @@
         echo "If you really want to compile without asm, configure with --disable-asm."
         exit 1
     fi
-else
-    AS=""
 fi
 
 CFLAGS="$CFLAGS -DARCH_$ARCH -DSYS_$SYS"
@@ -329,8 +327,10 @@
 
 echo "unsigned int endian = 'B' << 24 | 'I' << 16 | 'G' << 8 | 'E';" > conftest.c
 $CC $CFLAGS conftest.c -c -o conftest.o 2>$DEVNULL || die "endian test failed"
-grep -q BIGE conftest.o && CFLAGS="$CFLAGS -DWORDS_BIGENDIAN"
+/usr/bin/tr -cd "BIGE" < conftest.o | /usr/xpg4/bin/grep -q BIGE && CFLAGS="$CFLAGS -DWORDS_BIGENDIAN"
 
+echo $CFLAGS
+
 # autodetect options that weren't forced nor disabled
 
 libpthread=""
diff -ru x264/version.sh x264.solaris/version.sh
--- x264/version.sh	Mon Jun  9 01:36:08 2008
+++ x264.solaris/version.sh	Thu Jun 19 11:56:19 2008
@@ -1,7 +1,7 @@
 #!/bin/sh
 git-rev-list HEAD | sort > config.git-hash
 LOCALVER=`wc -l config.git-hash | awk '{print $1}'`
-if [ $LOCALVER \> 1 ] ; then
+if [ $LOCALVER -gt 1 ] ; then
     VER=`git-rev-list origin/master | sort | join config.git-hash - | wc -l | awk '{print $1}'`
     if [ $VER != $LOCALVER ] ; then
         VER="$VER+$(($LOCALVER-$VER))"
diff -ru x264/common/osdep.h x264.solaris/common/osdep.h
--- x264/common/osdep.h	Mon Jun  9 01:36:08 2008
+++ x264.solaris/common/osdep.h	Thu Jun 19 10:52:56 2008
@@ -48,6 +48,10 @@
 #define X264_VERSION "" // no configure script for msvc
 #endif
 
+#if defined(SYS_SunOS)
+#define isfinite _finite
+#endif
+
 #ifdef SYS_OPENBSD
 #define isfinite finite
 #endif