summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoerg <joerg>2013-10-11 14:54:05 +0000
committerjoerg <joerg>2013-10-11 14:54:05 +0000
commit826e2d2e271d398323d409b04b3441f845d7cc6a (patch)
treea7560217615b811ba4a5beeba26010f08f7978a3
parent56f7d099590119bd850fda82c739bdba15c6e6e4 (diff)
downloadpkgsrc-826e2d2e271d398323d409b04b3441f845d7cc6a.tar.gz
Make jpeglib.h work in files that don't include stdio.h first.
-rw-r--r--graphics/jpeg/Makefile3
-rw-r--r--graphics/jpeg/distinfo3
-rw-r--r--graphics/jpeg/patches/patch-jpeglib.h12
-rw-r--r--graphics/libjpeg-turbo/Makefile3
-rw-r--r--graphics/libjpeg-turbo/patches/patch-jpeglib.h12
5 files changed, 30 insertions, 3 deletions
diff --git a/graphics/jpeg/Makefile b/graphics/jpeg/Makefile
index 123e4d63640..876bc4a2a53 100644
--- a/graphics/jpeg/Makefile
+++ b/graphics/jpeg/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.47 2013/01/24 21:49:18 adam Exp $
+# $NetBSD: Makefile,v 1.48 2013/10/11 14:54:05 joerg Exp $
DISTNAME= jpegsrc.v9
PKGNAME= ${DISTNAME:S/src.v/-/}
+PKGREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://www.ijg.org/files/
diff --git a/graphics/jpeg/distinfo b/graphics/jpeg/distinfo
index e58dc0ee46f..5dfd091d49e 100644
--- a/graphics/jpeg/distinfo
+++ b/graphics/jpeg/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.16 2013/01/24 22:10:42 adam Exp $
+$NetBSD: distinfo,v 1.17 2013/10/11 14:54:05 joerg Exp $
SHA1 (jpegsrc.v9.tar.gz) = 724987e7690ca3d74d6ab7c1f1b6854e88ca204b
RMD160 (jpegsrc.v9.tar.gz) = 048e52334f6341424bd684458799d9c72254e8ec
@@ -6,3 +6,4 @@ Size (jpegsrc.v9.tar.gz) = 987900 bytes
SHA1 (patch-af) = aba44e1e3520d2a232f6bd949a82c150e0b3e0f4
SHA1 (patch-ag) = 4fc698186d149f1152d30bf65a96461bc331c812
SHA1 (patch-jmorecfg.h) = 153694c30f466222240275a7c9f525d6df60bda5
+SHA1 (patch-jpeglib.h) = 635453c5a2b1223ef5af729edcbfcfa3ed78a8b5
diff --git a/graphics/jpeg/patches/patch-jpeglib.h b/graphics/jpeg/patches/patch-jpeglib.h
new file mode 100644
index 00000000000..d4cc4e80238
--- /dev/null
+++ b/graphics/jpeg/patches/patch-jpeglib.h
@@ -0,0 +1,12 @@
+$NetBSD: patch-jpeglib.h,v 1.1 2013/10/11 14:54:06 joerg Exp $
+
+--- jpeglib.h.orig 2013-10-11 13:06:28.000000000 +0000
++++ jpeglib.h
+@@ -26,6 +26,7 @@
+ #endif
+ #include "jmorecfg.h" /* seldom changed options */
+
++#include <stdio.h>
+
+ #ifdef __cplusplus
+ #ifndef DONT_USE_EXTERN_C
diff --git a/graphics/libjpeg-turbo/Makefile b/graphics/libjpeg-turbo/Makefile
index f6f8b3e4d6d..1bc83e3daeb 100644
--- a/graphics/libjpeg-turbo/Makefile
+++ b/graphics/libjpeg-turbo/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2013/08/21 15:24:00 richard Exp $
+# $NetBSD: Makefile,v 1.10 2013/10/11 14:54:06 joerg Exp $
#
DISTNAME= libjpeg-turbo-1.3.0
+PKGREVISION= 1
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libjpeg-turbo/}
diff --git a/graphics/libjpeg-turbo/patches/patch-jpeglib.h b/graphics/libjpeg-turbo/patches/patch-jpeglib.h
new file mode 100644
index 00000000000..1ad15940897
--- /dev/null
+++ b/graphics/libjpeg-turbo/patches/patch-jpeglib.h
@@ -0,0 +1,12 @@
+$NetBSD: patch-jpeglib.h,v 1.1 2013/10/11 14:54:06 joerg Exp $
+
+--- jpeglib.h.orig 2013-10-11 13:07:30.000000000 +0000
++++ jpeglib.h
+@@ -28,6 +28,7 @@
+ #endif
+ #include "jmorecfg.h" /* seldom changed options */
+
++#include <stdio.h>
+
+ #ifdef __cplusplus
+ #ifndef DONT_USE_EXTERN_C