diff options
Diffstat (limited to 'media-gfx/uniconvertor/files')
5 files changed, 0 insertions, 179 deletions
diff --git a/media-gfx/uniconvertor/files/uniconvertor-2.0_pre379-ImageMagick7.patch b/media-gfx/uniconvertor/files/uniconvertor-2.0_pre379-ImageMagick7.patch deleted file mode 100644 index c79b79231587..000000000000 --- a/media-gfx/uniconvertor/files/uniconvertor-2.0_pre379-ImageMagick7.patch +++ /dev/null @@ -1,72 +0,0 @@ ---- a/src/uc2/libimg/_libimg.c 2013-02-25 11:20:00.000000000 +0100 -+++ b/src/uc2/libimg/_libimg.c 2016-07-11 09:41:03.721305655 +0200 -@@ -16,8 +16,8 @@ - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -+#include <MagickWand/MagickWand.h> - #include <Python.h> --#include <wand/MagickWand.h> - - static PyObject * - im_InitMagick(PyObject *self, PyObject *args) { -@@ -184,33 +184,18 @@ - else if (img_type == GrayscaleType){ - return Py_BuildValue("s", "GrayscaleType"); - } -- else if (img_type == GrayscaleMatteType){ -- return Py_BuildValue("s", "GrayscaleMatteType"); -- } - else if (img_type == PaletteType){ - return Py_BuildValue("s", "PaletteType"); - } -- else if (img_type == PaletteMatteType){ -- return Py_BuildValue("s", "PaletteMatteType"); -- } - else if (img_type == TrueColorType){ - return Py_BuildValue("s", "TrueColorType"); - } -- else if (img_type == TrueColorMatteType){ -- return Py_BuildValue("s", "TrueColorMatteType"); -- } - else if (img_type == ColorSeparationType){ - return Py_BuildValue("s", "ColorSeparationType"); - } -- else if (img_type == ColorSeparationMatteType){ -- return Py_BuildValue("s", "ColorSeparationMatteType"); -- } - else if (img_type == OptimizeType){ - return Py_BuildValue("s", "OptimizeType"); - } -- else if (img_type == PaletteBilevelMatteType){ -- return Py_BuildValue("s", "PaletteBilevelMatteType"); -- } - else { - return Py_BuildValue("s", "UndefinedType"); - } -@@ -235,9 +220,7 @@ - //HSBColorspace, - //HSLColorspace, - //HWBColorspace, --//Rec601LumaColorspace, - //Rec601YCbCrColorspace, --//Rec709LumaColorspace, - //Rec709YCbCrColorspace, - //LogColorspace, - //CMYColorspace -@@ -305,15 +288,9 @@ - else if (cs == HWBColorspace){ - return Py_BuildValue("s", "HWBColorspace"); - } -- else if (cs == Rec601LumaColorspace){ -- return Py_BuildValue("s", "Rec601LumaColorspace"); -- } - else if (cs == Rec601YCbCrColorspace){ - return Py_BuildValue("s", "Rec601YCbCrColorspace"); - } -- else if (cs == Rec709LumaColorspace){ -- return Py_BuildValue("s", "Rec709LumaColorspace"); -- } - else if (cs == Rec709YCbCrColorspace){ - return Py_BuildValue("s", "Rec709YCbCrColorspace"); - } diff --git a/media-gfx/uniconvertor/files/uniconvertor-2.0_pre379-abs.patch b/media-gfx/uniconvertor/files/uniconvertor-2.0_pre379-abs.patch deleted file mode 100644 index c344f8b1c54d..000000000000 --- a/media-gfx/uniconvertor/files/uniconvertor-2.0_pre379-abs.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/src/uc2/formats/sk1/sk1objs/curvelow.c -+++ b/src/uc2/formats/sk1/sk1objs/curvelow.c -@@ -24,6 +24,7 @@ - - - #include "math.h" -+#include <stdlib.h> /* abs() */ - // #include "X11/Xlib.h" - #include "curvelow.h" - diff --git a/media-gfx/uniconvertor/files/uniconvertor-2.0_pre379-import.patch b/media-gfx/uniconvertor/files/uniconvertor-2.0_pre379-import.patch deleted file mode 100644 index fae5535c6492..000000000000 --- a/media-gfx/uniconvertor/files/uniconvertor-2.0_pre379-import.patch +++ /dev/null @@ -1,30 +0,0 @@ - src/uc2/formats/sk1/model.py | 2 +- - src/unittests/image_tests/__init__.py | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/uc2/formats/sk1/model.py b/src/uc2/formats/sk1/model.py -index 33e2b55..59aecf2 100644 ---- a/src/uc2/formats/sk1/model.py -+++ b/src/uc2/formats/sk1/model.py -@@ -16,7 +16,7 @@ - # along with this program. If not, see <http://www.gnu.org/licenses/>. - - from copy import deepcopy --import Image -+from PIL import Image - - from uc2 import _, uc2const - from uc2.formats.pdxf import const -diff --git a/src/unittests/image_tests/__init__.py b/src/unittests/image_tests/__init__.py -index 031cd9f..6165129 100644 ---- a/src/unittests/image_tests/__init__.py -+++ b/src/unittests/image_tests/__init__.py -@@ -16,7 +16,7 @@ - # along with this program. If not, see <http://www.gnu.org/licenses/>. - - import unittest, os, shutil --import Image -+from PIL import Image - - - _pkgdir = __path__[0] diff --git a/media-gfx/uniconvertor/files/uniconvertor-2.0_pre379-libimg.patch b/media-gfx/uniconvertor/files/uniconvertor-2.0_pre379-libimg.patch deleted file mode 100644 index f84b332ec63e..000000000000 --- a/media-gfx/uniconvertor/files/uniconvertor-2.0_pre379-libimg.patch +++ /dev/null @@ -1,30 +0,0 @@ - setup.py | 16 ++++++++-------- - 1 file changed, 8 insertions(+), 8 deletions(-) - -diff --git a/setup.py b/setup.py -index 46cda83..5cfd22a 100644 ---- a/setup.py -+++ b/setup.py -@@ -184,14 +184,14 @@ modules.append(cairo_module) - # libraries=['potrace']) - #modules.append(trace_module) - --#libimg_src = os.path.join(src_path, 'uc2', 'libimg') --#files = make_source_list(libimg_src, ['_libimg.c', ]) --#include_dirs = make_source_list(include_path, ['ImageMagick', ]) --#libimg_module = Extension('uc2.libimg._libimg', --# define_macros=[('MAJOR_VERSION', '1'), ('MINOR_VERSION', '0')], --# sources=files, include_dirs=include_dirs, --# libraries=['MagickWand']) --#modules.append(libimg_module) -+libimg_src = os.path.join(src_path, 'uc2', 'libimg') -+files = make_source_list(libimg_src, ['_libimg.c', ]) -+include_dirs = make_source_list(include_path, ['ImageMagick-6', ]) -+libimg_module = Extension('uc2.libimg._libimg', -+ define_macros=[('MAJOR_VERSION', '1'), ('MINOR_VERSION', '0')], -+ sources=files, include_dirs=include_dirs, -+ libraries=['MagickWand']) -+modules.append(libimg_module) - - if os.path.isfile(os.path.join(include_path, 'lcms2.h')): - pycms_src = os.path.join(src_path, 'uc2', 'cms') diff --git a/media-gfx/uniconvertor/files/uniconvertor-2.0_pre379-test.patch b/media-gfx/uniconvertor/files/uniconvertor-2.0_pre379-test.patch deleted file mode 100644 index 2a3e3a00601f..000000000000 --- a/media-gfx/uniconvertor/files/uniconvertor-2.0_pre379-test.patch +++ /dev/null @@ -1,37 +0,0 @@ - src/unittests/_libimg_tests/__init__.py | 2 +- - src/unittests/image_tests/__init__.py | 4 +++- - 2 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/src/unittests/_libimg_tests/__init__.py b/src/unittests/_libimg_tests/__init__.py -index 3891290..cdc7dd6 100644 ---- a/src/unittests/_libimg_tests/__init__.py -+++ b/src/unittests/_libimg_tests/__init__.py -@@ -84,7 +84,7 @@ class TestCoreLibImgFunctions(unittest.TestCase): - def test07_image_type(self): - names = [] - names.append(['type_bilevel.png', 'BilevelType']) -- names.append(['type_grayscale.png', 'GrayscaleType']) -+ names.append(['type_grayscale.png', 'BilevelType']) - names.append(['type_palette.png', 'PaletteType']) - names.append(['type_palettematte.png', 'PaletteMatteType']) - names.append(['type_truecolor.png', 'TrueColorType']) -diff --git a/src/unittests/image_tests/__init__.py b/src/unittests/image_tests/__init__.py -index 031cd9f..265743a 100644 ---- a/src/unittests/image_tests/__init__.py -+++ b/src/unittests/image_tests/__init__.py -@@ -42,6 +42,7 @@ class TestImageFunctions(unittest.TestCase): - def tearDown(self):pass - # shutil.rmtree(self.save_dir) - -+ @unittest.skip("Broken") - def test01_create_new_image(self): - for mode in MODES: - image = Image.new(mode, (100, 100)) -@@ -77,6 +78,7 @@ class TestImageFunctions(unittest.TestCase): - result = False - self.assertNotEquals(False, result) - -+ @unittest.skip("Broken") - def test04_load_unsupported_images(self): - for name in FILES2: - filename = os.path.join(self.load_dir, name) |