patches/libvisual-01-solaris.diff
author yippi
Mon, 14 Mar 2011 17:54:33 +0000
changeset 21584 ae2f541f2106
parent 17905 88a86c5c0a44
permissions -rw-r--r--
2011-03-14 Brian Cameron <[email protected]> * base-specs/libvisual.spec, base-specs/libvisual-plugins.spec, patches/libvisual-02-compiler.diff, patches/libvisual-plugins-01-compiler.diff: Remove patches no longer needed with the Sun Studio 12.2 compiler. * patches/libvisual-01-solaris.diff: Remove hunk no longer needed with the Sun Studio 12.2 compiler.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
14669
1ccadbfcc384 2008-11-27 Jim Li <[email protected]>
jim
parents:
diff changeset
     1
diff -ru libvisual-0.4.0.orig/libvisual/lv_types.h libvisual-0.4.0/libvisual/lv_types.h
1ccadbfcc384 2008-11-27 Jim Li <[email protected]>
jim
parents:
diff changeset
     2
--- libvisual-0.4.0.orig/libvisual/lv_types.h	Tue Feb 14 04:54:08 2006
1ccadbfcc384 2008-11-27 Jim Li <[email protected]>
jim
parents:
diff changeset
     3
+++ libvisual-0.4.0/libvisual/lv_types.h	Tue Nov 25 14:15:26 2008
1ccadbfcc384 2008-11-27 Jim Li <[email protected]>
jim
parents:
diff changeset
     4
@@ -30,6 +30,11 @@
1ccadbfcc384 2008-11-27 Jim Li <[email protected]>
jim
parents:
diff changeset
     5
 #include <stdint.h>
1ccadbfcc384 2008-11-27 Jim Li <[email protected]>
jim
parents:
diff changeset
     6
 #else
1ccadbfcc384 2008-11-27 Jim Li <[email protected]>
jim
parents:
diff changeset
     7
 #include <sys/types.h>
1ccadbfcc384 2008-11-27 Jim Li <[email protected]>
jim
parents:
diff changeset
     8
+
1ccadbfcc384 2008-11-27 Jim Li <[email protected]>
jim
parents:
diff changeset
     9
+#if defined(__sun__) || defined(__sun)
1ccadbfcc384 2008-11-27 Jim Li <[email protected]>
jim
parents:
diff changeset
    10
+#include <inttypes.h>
1ccadbfcc384 2008-11-27 Jim Li <[email protected]>
jim
parents:
diff changeset
    11
+#endif
1ccadbfcc384 2008-11-27 Jim Li <[email protected]>
jim
parents:
diff changeset
    12
+
1ccadbfcc384 2008-11-27 Jim Li <[email protected]>
jim
parents:
diff changeset
    13
 #endif /* !VISUAL_OS_WIN32 */
1ccadbfcc384 2008-11-27 Jim Li <[email protected]>
jim
parents:
diff changeset
    14
 
1ccadbfcc384 2008-11-27 Jim Li <[email protected]>
jim
parents:
diff changeset
    15
 VISUAL_BEGIN_DECLS
1ccadbfcc384 2008-11-27 Jim Li <[email protected]>
jim
parents:
diff changeset
    16
@@ -38,7 +43,7 @@
1ccadbfcc384 2008-11-27 Jim Li <[email protected]>
jim
parents:
diff changeset
    17
 
1ccadbfcc384 2008-11-27 Jim Li <[email protected]>
jim
parents:
diff changeset
    18
 #define VISUAL_TABLESIZE(table)			(sizeof (table) / sizeof (table[0]))
1ccadbfcc384 2008-11-27 Jim Li <[email protected]>
jim
parents:
diff changeset
    19
 
1ccadbfcc384 2008-11-27 Jim Li <[email protected]>
jim
parents:
diff changeset
    20
-#if !defined(VISUAL_OS_WIN32)
1ccadbfcc384 2008-11-27 Jim Li <[email protected]>
jim
parents:
diff changeset
    21
+#if !defined(VISUAL_OS_WIN32) && !defined(__sun__) && !defined(__sun)
1ccadbfcc384 2008-11-27 Jim Li <[email protected]>
jim
parents:
diff changeset
    22
 #ifndef uint8_t
1ccadbfcc384 2008-11-27 Jim Li <[email protected]>
jim
parents:
diff changeset
    23
 #define uint8_t		u_int8_t
1ccadbfcc384 2008-11-27 Jim Li <[email protected]>
jim
parents:
diff changeset
    24
 #endif
1ccadbfcc384 2008-11-27 Jim Li <[email protected]>
jim
parents:
diff changeset
    25
@@ -50,7 +55,7 @@
1ccadbfcc384 2008-11-27 Jim Li <[email protected]>
jim
parents:
diff changeset
    26
 #ifndef uint32_t
1ccadbfcc384 2008-11-27 Jim Li <[email protected]>
jim
parents:
diff changeset
    27
 #define uint32_t	u_int32_t
1ccadbfcc384 2008-11-27 Jim Li <[email protected]>
jim
parents:
diff changeset
    28
 #endif
1ccadbfcc384 2008-11-27 Jim Li <[email protected]>
jim
parents:
diff changeset
    29
-#endif /* !VISUAL_OS_WIN32 */
1ccadbfcc384 2008-11-27 Jim Li <[email protected]>
jim
parents:
diff changeset
    30
+#endif /* !VISUAL_OS_WIN32 && !__sun__ && !__sun */
1ccadbfcc384 2008-11-27 Jim Li <[email protected]>
jim
parents:
diff changeset
    31
 
1ccadbfcc384 2008-11-27 Jim Li <[email protected]>
jim
parents:
diff changeset
    32
 VISUAL_END_DECLS
1ccadbfcc384 2008-11-27 Jim Li <[email protected]>
jim
parents:
diff changeset
    33
 
17905
88a86c5c0a44 2010-04-22 Christian Kelly <[email protected]>
chrisk
parents: 15777
diff changeset
    34
diff -ruN libvisual-0.4.0.orig/configure.ac libvisual-0.4.0/configure.ac
88a86c5c0a44 2010-04-22 Christian Kelly <[email protected]>
chrisk
parents: 15777
diff changeset
    35
--- libvisual-0.4.0.orig/configure.ac  2010-04-22 14:25:31.689386300 +0100
88a86c5c0a44 2010-04-22 Christian Kelly <[email protected]>
chrisk
parents: 15777
diff changeset
    36
+++ libvisual-0.4.0/configure.ac       2010-04-22 14:27:22.487439900 +0100
88a86c5c0a44 2010-04-22 Christian Kelly <[email protected]>
chrisk
parents: 15777
diff changeset
    37
@@ -24,6 +24,8 @@
88a86c5c0a44 2010-04-22 Christian Kelly <[email protected]>
chrisk
parents: 15777
diff changeset
    38
 
88a86c5c0a44 2010-04-22 Christian Kelly <[email protected]>
chrisk
parents: 15777
diff changeset
    39
 AC_CANONICAL_HOST
88a86c5c0a44 2010-04-22 Christian Kelly <[email protected]>
chrisk
parents: 15777
diff changeset
    40
 
88a86c5c0a44 2010-04-22 Christian Kelly <[email protected]>
chrisk
parents: 15777
diff changeset
    41
+AC_PROG_CC
88a86c5c0a44 2010-04-22 Christian Kelly <[email protected]>
chrisk
parents: 15777
diff changeset
    42
+
88a86c5c0a44 2010-04-22 Christian Kelly <[email protected]>
chrisk
parents: 15777
diff changeset
    43
 lv_mips=no
88a86c5c0a44 2010-04-22 Christian Kelly <[email protected]>
chrisk
parents: 15777
diff changeset
    44
 lv_alpha=no
88a86c5c0a44 2010-04-22 Christian Kelly <[email protected]>
chrisk
parents: 15777
diff changeset
    45
 lv_sparc=no
88a86c5c0a44 2010-04-22 Christian Kelly <[email protected]>
chrisk
parents: 15777
diff changeset
    46
@@ -104,7 +106,6 @@
88a86c5c0a44 2010-04-22 Christian Kelly <[email protected]>
chrisk
parents: 15777
diff changeset
    47
 
88a86c5c0a44 2010-04-22 Christian Kelly <[email protected]>
chrisk
parents: 15777
diff changeset
    48
 # Checks for programs.
88a86c5c0a44 2010-04-22 Christian Kelly <[email protected]>
chrisk
parents: 15777
diff changeset
    49
 AC_PROG_CXX
88a86c5c0a44 2010-04-22 Christian Kelly <[email protected]>
chrisk
parents: 15777
diff changeset
    50
-AC_PROG_CC
88a86c5c0a44 2010-04-22 Christian Kelly <[email protected]>
chrisk
parents: 15777
diff changeset
    51
 AC_PROG_CPP
88a86c5c0a44 2010-04-22 Christian Kelly <[email protected]>
chrisk
parents: 15777
diff changeset
    52
 AC_PROG_INSTALL
88a86c5c0a44 2010-04-22 Christian Kelly <[email protected]>
chrisk
parents: 15777
diff changeset
    53
 AC_PROG_LN_S