diff options
| author | Alexander Köplinger <alex.koeplinger@outlook.com> | 2017-05-28 02:15:24 +0300 |
|---|---|---|
| committer | Alexander Köplinger <alex.koeplinger@outlook.com> | 2017-05-28 02:15:24 +0300 |
| commit | 136411eb56d45c1c7f7175bf3a4178e10bf81455 (patch) | |
| tree | 6c541cfd8bdf71dce0f8122e50bd5accaf1becf7 /packages | |
| parent | 45aa142fa322f5b41051e7f40008f03346a1e119 (diff) | |
Remove patch from libtiff
It seems to be in upstream now that we updated to 4.0.8
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/libtiff.py | 13 | ||||
| -rw-r--r-- | packages/patches/tiff-4.0.2-macosx-2.patch | 22 |
2 files changed, 0 insertions, 35 deletions
diff --git a/packages/libtiff.py b/packages/libtiff.py index 7d0ad59..26eb691 100644 --- a/packages/libtiff.py +++ b/packages/libtiff.py @@ -10,17 +10,4 @@ class LibTiffPackage (Package): self.needs_lipo = True - if Package.profile.name == 'darwin': - self.sources.extend([ - # Fix Snow Leopard build - # http://jira.freeswitch.org/secure/attachment/17487/tiff-4.0.2-macosx-2.patch - 'patches/tiff-4.0.2-macosx-2.patch' - ]) - - def prep(self): - Package.prep(self) - if Package.profile.name == 'darwin': - for p in range(1, len(self.local_sources)): - self.sh('patch -p1 < "%{local_sources[' + str(p) + ']}"') - LibTiffPackage() diff --git a/packages/patches/tiff-4.0.2-macosx-2.patch b/packages/patches/tiff-4.0.2-macosx-2.patch deleted file mode 100644 index a5f74df..0000000 --- a/packages/patches/tiff-4.0.2-macosx-2.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/libs/tiff-4.0.2/tools/tiffgt.c b/libs/tiff-4.0.2/tools/tiffgt.c -index de42039..4c8e509 100644 ---- a/tools/tiffgt.c -+++ b/tools/tiffgt.c -@@ -31,11 +31,16 @@ - #include <string.h> - #include <unistd.h> - --#if HAVE_APPLE_OPENGL_FRAMEWORK -+#if HAVE_OPENGL_GL_H - # include <OpenGL/gl.h> -+#endif -+#if HAVE_GLUT_GLUT_H - # include <GLUT/glut.h> --#else -+#endif -+#if HAVE_GL_GL_H - # include <GL/gl.h> -+#endif -+#if HAVE_GL_GLUT_H - # include <GL/glut.h> - #endif |