patches/mplayer-11-cpudetect.diff
author jurikm
Sun, 12 Feb 2012 14:04:10 +0000
changeset 8245 383896da4129
parent 3137 13df9e729f6b
permissions -rw-r--r--
SFEsauerbraten.spec: add IPS package name
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
3137
13df9e729f6b SFEmplayer.spec: bump to 1.0rc4, remove unneeded patches
jurikm
parents: 2725
diff changeset
     1
--- MPlayer-1.0rc4/cpudetect.c	2011-01-30 14:05:52.874908169 +0100
13df9e729f6b SFEmplayer.spec: bump to 1.0rc4, remove unneeded patches
jurikm
parents: 2725
diff changeset
     2
+++ MPlayer-1.0rc4-patch/cpudetect.c	2011-01-30 14:06:11.535004688 +0100
13df9e729f6b SFEmplayer.spec: bump to 1.0rc4, remove unneeded patches
jurikm
parents: 2725
diff changeset
     3
@@ -45,8 +45,11 @@
2725
344efadac0aa encumbered/SFEmplayer.spec: update to rc3, cleanup in patches
jurikm
parents: 1732
diff changeset
     4
 #include <os2.h>
344efadac0aa encumbered/SFEmplayer.spec: update to rc3, cleanup in patches
jurikm
parents: 1732
diff changeset
     5
 #elif defined(__AMIGAOS4__)
1732
7e8c8d63d96d 2009-03-14 Milan Jurik <[email protected]>
jurikm
parents:
diff changeset
     6
 #include <proto/exec.h>
3137
13df9e729f6b SFEmplayer.spec: bump to 1.0rc4, remove unneeded patches
jurikm
parents: 2725
diff changeset
     7
+#elif defined(__sun)
1732
7e8c8d63d96d 2009-03-14 Milan Jurik <[email protected]>
jurikm
parents:
diff changeset
     8
+#include <sys/utsname.h>
7e8c8d63d96d 2009-03-14 Milan Jurik <[email protected]>
jurikm
parents:
diff changeset
     9
 #endif
7e8c8d63d96d 2009-03-14 Milan Jurik <[email protected]>
jurikm
parents:
diff changeset
    10
 
3137
13df9e729f6b SFEmplayer.spec: bump to 1.0rc4, remove unneeded patches
jurikm
parents: 2725
diff changeset
    11
+
13df9e729f6b SFEmplayer.spec: bump to 1.0rc4, remove unneeded patches
jurikm
parents: 2725
diff changeset
    12
 /* Thanks to the FreeBSD project for some of this cpuid code, and
13df9e729f6b SFEmplayer.spec: bump to 1.0rc4, remove unneeded patches
jurikm
parents: 2725
diff changeset
    13
  * help understanding how to use it.  Thanks to the Mesa
13df9e729f6b SFEmplayer.spec: bump to 1.0rc4, remove unneeded patches
jurikm
parents: 2725
diff changeset
    14
  * team for SSE support detection and more cpu detect code.
13df9e729f6b SFEmplayer.spec: bump to 1.0rc4, remove unneeded patches
jurikm
parents: 2725
diff changeset
    15
@@ -416,6 +419,20 @@
13df9e729f6b SFEmplayer.spec: bump to 1.0rc4, remove unneeded patches
jurikm
parents: 2725
diff changeset
    16
     mp_msg(MSGT_CPUDETECT,MSGL_WARN, "Cannot test OS support for SSE, disabling to be safe.\n" );
13df9e729f6b SFEmplayer.spec: bump to 1.0rc4, remove unneeded patches
jurikm
parents: 2725
diff changeset
    17
     gCpuCaps.hasSSE=0;
13df9e729f6b SFEmplayer.spec: bump to 1.0rc4, remove unneeded patches
jurikm
parents: 2725
diff changeset
    18
 #endif /* _POSIX_SOURCE */
1732
7e8c8d63d96d 2009-03-14 Milan Jurik <[email protected]>
jurikm
parents:
diff changeset
    19
+#elif defined(__sun)
7e8c8d63d96d 2009-03-14 Milan Jurik <[email protected]>
jurikm
parents:
diff changeset
    20
+   struct utsname solname;
7e8c8d63d96d 2009-03-14 Milan Jurik <[email protected]>
jurikm
parents:
diff changeset
    21
+   long major, minor = 0;
7e8c8d63d96d 2009-03-14 Milan Jurik <[email protected]>
jurikm
parents:
diff changeset
    22
+   char *radix;
7e8c8d63d96d 2009-03-14 Milan Jurik <[email protected]>
jurikm
parents:
diff changeset
    23
+
7e8c8d63d96d 2009-03-14 Milan Jurik <[email protected]>
jurikm
parents:
diff changeset
    24
+   if (uname(&solname) > 0) {
7e8c8d63d96d 2009-03-14 Milan Jurik <[email protected]>
jurikm
parents:
diff changeset
    25
+      major = strtol(solname.release, &radix, 10);
7e8c8d63d96d 2009-03-14 Milan Jurik <[email protected]>
jurikm
parents:
diff changeset
    26
+      if (*radix != '\0')
7e8c8d63d96d 2009-03-14 Milan Jurik <[email protected]>
jurikm
parents:
diff changeset
    27
+         minor = strtol(++radix, NULL, 10);
7e8c8d63d96d 2009-03-14 Milan Jurik <[email protected]>
jurikm
parents:
diff changeset
    28
+      if (!(major >= 5 && minor >= 9))
7e8c8d63d96d 2009-03-14 Milan Jurik <[email protected]>
jurikm
parents:
diff changeset
    29
+         gCpuCaps.hasSSE=0;
7e8c8d63d96d 2009-03-14 Milan Jurik <[email protected]>
jurikm
parents:
diff changeset
    30
+   } else {
7e8c8d63d96d 2009-03-14 Milan Jurik <[email protected]>
jurikm
parents:
diff changeset
    31
+      gCpuCaps.hasSSE=0;
7e8c8d63d96d 2009-03-14 Milan Jurik <[email protected]>
jurikm
parents:
diff changeset
    32
+   }
3137
13df9e729f6b SFEmplayer.spec: bump to 1.0rc4, remove unneeded patches
jurikm
parents: 2725
diff changeset
    33
 #else
13df9e729f6b SFEmplayer.spec: bump to 1.0rc4, remove unneeded patches
jurikm
parents: 2725
diff changeset
    34
     /* Do nothing on other platforms for now.
13df9e729f6b SFEmplayer.spec: bump to 1.0rc4, remove unneeded patches
jurikm
parents: 2725
diff changeset
    35
      */