patches/pyglet-01-lib.diff
author yippi
Wed, 21 Jan 2009 10:51:07 +0000
changeset 1641 bee7722f9bdd
permissions -rw-r--r--
2009-01-21 Brian Cameron <[email protected]> * SFEsdl-ttf.spec: Fix packaging. * SFepyglet.spec, patches/piglet-01-lib.diff: Add version 1.1.2 and patch needed to build. * SFEpython-ctypes.spec, patches/python-ctypes-01-ffitarget.diff: Add version 1.0.2 and patch needed to build. * SFEpygame.spec, patches/pygame-01-scrap.diff, patches/pygame-02-noconfirm.diff: Add version 1.8.1 and patches needed to build.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1641
bee7722f9bdd 2009-01-21 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
     1
--- pyglet-1.1.2/pyglet/lib.py-orig	2009-01-21 04:37:54.586130000 -0600
bee7722f9bdd 2009-01-21 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
     2
+++ pyglet-1.1.2/pyglet/lib.py	2009-01-21 04:38:21.296254000 -0600
bee7722f9bdd 2009-01-21 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
     3
@@ -95,8 +95,7 @@ class LibraryLoader(object):
bee7722f9bdd 2009-01-21 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
     4
         elif type(platform_names) is tuple:
bee7722f9bdd 2009-01-21 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
     5
             platform_names = list(platform_names)
bee7722f9bdd 2009-01-21 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
     6
 
bee7722f9bdd 2009-01-21 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
     7
-        if self.platform == 'linux2':
bee7722f9bdd 2009-01-21 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
     8
-            platform_names.extend(['lib%s.so' % n for n in names])
bee7722f9bdd 2009-01-21 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
     9
+        platform_names.extend(['lib%s.so' % n for n in names])
bee7722f9bdd 2009-01-21 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    10
 
bee7722f9bdd 2009-01-21 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    11
         platform_names.extend(names)
bee7722f9bdd 2009-01-21 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    12
         for name in platform_names:
bee7722f9bdd 2009-01-21 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    13
@@ -294,10 +293,6 @@ class LinuxLibraryLoader(LibraryLoader):
bee7722f9bdd 2009-01-21 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    14
 
bee7722f9bdd 2009-01-21 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    15
         return self._ld_so_cache.get(path)
bee7722f9bdd 2009-01-21 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    16
 
bee7722f9bdd 2009-01-21 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    17
-if sys.platform == 'darwin':
bee7722f9bdd 2009-01-21 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    18
-    loader = MachOLibraryLoader()
bee7722f9bdd 2009-01-21 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    19
-elif sys.platform == 'linux2':
bee7722f9bdd 2009-01-21 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    20
-    loader = LinuxLibraryLoader()
bee7722f9bdd 2009-01-21 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    21
-else:
bee7722f9bdd 2009-01-21 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    22
-    loader = LibraryLoader()
bee7722f9bdd 2009-01-21 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    23
+loader = LinuxLibraryLoader()
bee7722f9bdd 2009-01-21 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    24
+
bee7722f9bdd 2009-01-21 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    25
 load_library = loader.load_library