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 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150
|
Last-Update: 2014-06-07
Forwarded: no
Author: Dmitry Smirnov <onlyjob@member.fsf.org>
Bug-Upstream: https://code.google.com/p/python-webm/issues/detail?id=1
Description: rename and improve __init__.py in order to hardcode tested libwebp library name
--- /dev/null
+++ b/webm/__init__.py.in
@@ -0,0 +1,69 @@
+# -*- coding: utf-8 -*-
+"""
+The original version of python-webm can be found here:
+https://code.google.com/p/python-webm/
+This modified version adds support for lossless compression.
+
+Copyright (c) 2011, Daniele Esposti <expo@expobrain.net>
+Copyright (c) 2012-2014 Antoine Martin <antoine@devloop.org.uk>
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ * The name of the contributors may be used to endorse or promote products
+ derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+"""
+
+import sys, os
+from ctypes import cdll as loader
+
+
+# Generic constants
+__VERSION__ = "0.2.4"
+
+PIXEL_SZ = 3
+PIXEL_ALPHA_SZ = 4
+
+
+# Per-OS setup
+if sys.platform == "win32":
+ _LIBRARY = "libwebp_a.dll"
+
+elif sys.platform == "linux2":
+ _LIBRARY = "libwebp.so.0"
+
+elif sys.platform == "darwin":
+ _LIBRARY = "libwebp.dylib"
+
+elif sys.platform == "posix":
+ _LIBRARY = "libwebp.so.0"
+
+else:
+ raise NotImplementedError(
+ "Test non implemented under %s / %s" % (os.name, sys.platform))
+
+try:
+# Load library
+ _LIBRARY = loader.LoadLibrary(_LIBRARY)
+except:
+ raise ImportError("Unable to find shared library 'webp'.")
+
+def check_library():
+ if _LIBRARY is None:
+ raise ImportError("Could not find webp library from %s" % str(_LIBRARY_NAMES))
--- a/webm/__init__.py
+++ /dev/null
@@ -1,69 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-The original version of python-webm can be found here:
-https://code.google.com/p/python-webm/
-This modified version adds support for lossless compression.
-
-Copyright (c) 2011, Daniele Esposti <expo@expobrain.net>
-Copyright (c) 2012-2014 Antoine Martin <antoine@devloop.org.uk>
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
- * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
- * The name of the contributors may be used to endorse or promote products
- derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-"""
-
-import sys, os
-from ctypes import cdll as loader
-
-
-# Generic constants
-__VERSION__ = "0.2.4"
-
-PIXEL_SZ = 3
-PIXEL_ALPHA_SZ = 4
-
-
-# Per-OS setup
-if sys.platform == "win32":
- _LIBRARY_NAMES = ["libwebp-4.dll", "libwebp.dll"]
-
-elif sys.platform == "darwin":
- _LIBRARY_NAMES = ["libwebp.dylib"]
-
-elif os.name == "posix":
- _LIBRARY_NAMES = ["libwebp.so.5", "libwebp.so.4"]
-
-else:
- raise ImportError(
- "Test non implemented under %s / %s" % (os.name, sys.platform))
-
-# Load library
-_LIBRARY = None
-for name in _LIBRARY_NAMES:
- try:
- _LIBRARY = loader.LoadLibrary(name)
- break
- except:
- pass
-
-def check_library():
- if _LIBRARY is None:
- raise ImportError("Could not find webp library from %s" % str(_LIBRARY_NAMES))
|