Skip to contentSkip to conversation

hplip: Fix build with clang

PATCH New Khem Raj 1 participant 3 messages Dec 21, 2016

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH v2 1/1 hplip: Fix build with clang

---
 ...de-cups-ppd.h-for-missing-ppd-definitions.patch | 40 ++++++++++++++++++++++
 meta-oe/recipes-extended/hplip/hplip_3.12.6.bb     |  1 +
 2 files changed, 41 insertions(+)
 create mode 100644 meta-oe/recipes-extended/hplip/hplip-3.12.6/0001-include-cups-ppd.h-for-missing-ppd-definitions.patch
meta-oe/recipes-extended/hplip/hplip-3.12.6/0001-include-cups-ppd.h-for-missing-ppd-definitions.patch new file +40 -0
new file mode 100644
index 000000000..84a39aeb8
@@ -0,0 +1,40 @@
+From 7ef9c040dd959105c16d4dc67e14f3bbea25e77f Mon Sep 17 00:00:00 2001
+From: Khem Raj <[email protected]>
+Date: Fri, 16 Dec 2016 19:51:19 +0000
+Subject: [PATCH] include cups/ppd.h for missing ppd definitions
+
+Fixes errors spotted by clang
+
+| prnt/hpcups/HPCupsFilter.cpp:365:18: error: use of undeclared identifier 'ppdFindAttr'
+|     if (((attr = ppdFindAttr(m_ppd, "hpPrinterLanguage", NULL)) == NULL) ||
+|                  ^
+| prnt/hpcups/HPCupsFilter.cpp:368:13: error: use of undeclared identifier 'ppdClose'
+|             ppdClose(m_ppd);
+|             ^
+| prnt/hpcups/HPCupsFilter.cpp:444:9: error: use of undeclared identifier 'ppdClose'
+|         ppdClose(m_ppd);
+|         ^
+| prnt/hpcups/HPCupsFilter.cpp:497:13: error: use of undeclared identifier 'ppdOpenFile'
+|     m_ppd = ppdOpenFile(getenv("PPD"));
+|             ^
+
+Signed-off-by: Khem Raj <[email protected]>
+---
+Upstream-Status: Pending
+
+ prnt/hpcups/HPCupsFilter.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+Index: hplip-3.12.6/prnt/hpcups/HPCupsFilter.h
+===================================================================
+--- hplip-3.12.6.orig/prnt/hpcups/HPCupsFilter.h
++++ hplip-3.12.6/prnt/hpcups/HPCupsFilter.h
+@@ -37,7 +37,7 @@
+ #include "Job.h"
+ 
+ #include "dbuscomm.h"
+-
++#include <cups/ppd.h>
+ #define		DBITMAPFILEHEADER		14
+ #define		DBITMAPINFOHEADER		40
+ 
meta-oe/recipes-extended/hplip/hplip_3.12.6.bb +1 -0
index 9848e5ac1..1f1e80ce8 100644
@@ -9,6 +9,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.gz \
            file://fix-libusb-paths.patch \
            file://cups-1.6.patch \
            file://configure.patch \
+           file://0001-include-cups-ppd.h-for-missing-ppd-definitions.patch \
 "
 
 DEPENDS += "cups python libusb"
Signature · 1 line
2.11.0
author
#1 lore raw

PATCH v3 1/1 yajl_1.0.12: Add recipe for yajl1

yajl1 and yajl2 are not ABI compatible, therefore
add a recipe for latest release of yajl1

---
 .../yajl-1.0.12/0001-bump-version-to-1.0.12.patch  | 25 ++++++++++++++++++++++
 meta-oe/recipes-devtools/yajl/yajl_1.0.12.bb       | 19 ++++++++++++++++
 2 files changed, 44 insertions(+)
 create mode 100644 meta-oe/recipes-devtools/yajl/yajl-1.0.12/0001-bump-version-to-1.0.12.patch
 create mode 100644 meta-oe/recipes-devtools/yajl/yajl_1.0.12.bb
meta-oe/recipes-devtools/yajl/yajl-1.0.12/0001-bump-version-to-1.0.12.patch new file +25 -0
new file mode 100644
index 000000000..5e8aef051
@@ -0,0 +1,25 @@
+From 17b1790fb9c8abbb3c0f7e083864a6a014191d56 Mon Sep 17 00:00:00 2001
+From: Lloyd Hilaiel <[email protected]>
+Date: Mon, 25 Apr 2011 12:56:24 -0600
+Subject: [PATCH] bump version to 1.0.12
+
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 727a488..c703244 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -34,7 +34,7 @@ PROJECT(YetAnotherJSONParser C)
+ 
+ SET (YAJL_MAJOR 1)
+ SET (YAJL_MINOR 0)
+-SET (YAJL_MICRO 11)
++SET (YAJL_MICRO 12)
+ 
+ SET (YAJL_DIST_NAME "yajl-${YAJL_MAJOR}.${YAJL_MINOR}.${YAJL_MICRO}")
+ 
+-- 
+2.11.0
+
meta-oe/recipes-devtools/yajl/yajl_1.0.12.bb new file +19 -0
new file mode 100644
index 000000000..8ced7b84f
@@ -0,0 +1,19 @@
+SUMMARY = "Yet Another JSON Library."
+
+DESCRIPTION = "YAJL is a small event-driven (SAX-style) JSON parser \
+written in ANSI C, and a small validating JSON generator."
+
+HOMEPAGE = "http://lloyd.github.com/yajl/"
+
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://COPYING;md5=da2e9aa80962d54e7c726f232a2bd1e8"
+
+# Use 1.0.12 tag
+SRCREV = "17b1790fb9c8abbb3c0f7e083864a6a014191d56"
+SRC_URI = "git://github.com/lloyd/yajl;nobranch=1"
+
+inherit cmake lib_package
+
+S = "${WORKDIR}/git"
+
+EXTRA_OECMAKE = "-DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')}"
Signature · 1 line
2.11.0
author
#2 lore raw

PATCH v2 2/3 usrsctp: Add recipe

In reply to Khem Raj
---
 .../0001-Use-foreign-switch-for-automake.patch     | 28 ++++++++++++++++++++++
 .../recipes-protocols/usrsctp/usrsctp_git.bb       | 26 ++++++++++++++++++++
 2 files changed, 54 insertions(+)
 create mode 100644 meta-networking/recipes-protocols/usrsctp/usrsctp/0001-Use-foreign-switch-for-automake.patch
 create mode 100644 meta-networking/recipes-protocols/usrsctp/usrsctp_git.bb
meta-networking/recipes-protocols/usrsctp/usrsctp/0001-Use-foreign-switch-for-automake.patch new file +28 -0
new file mode 100644
index 000000000..b932ebbb4
@@ -0,0 +1,28 @@
+From 748bc693cf24baf42e459e12f152349e392b6737 Mon Sep 17 00:00:00 2001
+From: Khem Raj <[email protected]>
+Date: Tue, 20 Dec 2016 21:32:11 -0800
+Subject: [PATCH] Use foreign switch for automake
+
+Signed-off-by: Khem Raj <[email protected]>
+---
+Upstream-Status: Pending
+
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 64cc9994..19ccd4a3 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -29,7 +29,7 @@ dnl SUCH DAMAGE.
+ dnl
+ 
+ AC_INIT([libusrsctp], [0.9.3.0])
+-AM_INIT_AUTOMAKE
++AM_INIT_AUTOMAKE([foreign])
+ 
+ AC_PROG_CC
+ AC_PROG_LIBTOOL
+-- 
+2.11.0
+
meta-networking/recipes-protocols/usrsctp/usrsctp_git.bb new file +26 -0
new file mode 100644
index 000000000..99a261ec7
@@ -0,0 +1,26 @@
+DESCRIPTION = "This is a userland SCTP stack supporting FreeBSD, Linux, Mac OS X and Windows."
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://LICENSE.md;md5=ffcf846341f3856d79a483eafa18e2a5"
+
+SRCREV = "dbfc1b8c4cf1a46a4d8987ba542d5ff06bdaf14c"
+SRC_URI = "git://github.com/sctplab/usrsctp;protocol=https;branch=master \
+           file://0001-Use-foreign-switch-for-automake.patch \
+          "
+
+S = "${WORKDIR}/git"
+
+inherit autotools pkgconfig
+
+DEPENDS += "openssl"
+
+CFLAGS  += "-DSCTP_USE_OPENSSL_SHA1 -fPIC"
+LDFLAGS += "-lssl -lcrypto"
+
+PACKAGECONFIG ?= "disablewarnings"
+PACKAGECONFIG[disablewarnings] = "--disable-warnings-as-errors,,"
+
+EXTRA_OECONF += "--disable-inet \
+                 --disable-inet6 \
+                 --disable-shared \
+                 --disable-debug \
+               "
Signature · 1 line
2.11.0