Update some packages

PATCH In review Kai Kang 2 participants 9 messages Mar 12, 2014 – Mar 21, 2014

lore

Share & tools

lore

Kai Kang

author

2014-03-12 07:47 UTC #0 lore raw

cover Update some packages

The following changes since commit 1960f6b2ecbb793b40ebc9aed25c8f9cb7884c9a:

populate_sdk_deb: Fix meta-toolchain-sdk with amd64 ARCH (2014-03-11 20:28:58 -0700)

are available in the git repository at:

git://git.yoctoproject.org/poky-contrib kangkai/update-pkgs
http://git.yoctoproject.org/cgit.cgi//log/?h=kangkai/update-pkgs

Kai Kang (5):
qmmp: update to 0.7.5
directfb: update to 1.7.1
directfb-examples: update to 1.7.0
alsa-tools: update to version 1.0.27
libnewt: update to 0.52.17

 meta/recipes-extended/newt/files/cross_ar.patch     | 16 ++++------------
 .../recipes-extended/newt/files/fix_SHAREDDIR.patch |  4 ++--
 .../recipes-extended/newt/libnewt-python_0.52.14.bb |  5 ++---
 meta/recipes-extended/newt/libnewt_0.52.14.bb       | 10 ++++------
 ...examples_1.6.0.bb => directfb-examples_1.7.0.bb} |  4 ++--
 meta/recipes-graphics/directfb/directfb.inc         |  4 +---
 .../{directfb_1.6.3.bb => directfb_1.7.1.bb}        | 10 ++++------
 .../alsa/alsa-tools/autotools.patch                 | 15 ++++++---------
 ...{alsa-tools_1.0.26.1.bb => alsa-tools_1.0.27.bb} |  8 +++-----
 meta/recipes-qt/qt-apps/qmmp/no-host-paths.patch    | 13 +++++++------
 .../recipes-qt/qt-apps/qmmp/no-sessionmanager.patch | 21 ---------------------
 .../qt-apps/{qmmp_0.6.6.bb => qmmp_0.7.5.bb}        |  6 +++---
 12 files changed, 38 insertions(+), 78 deletions(-)
 rename meta/recipes-graphics/directfb/{directfb-examples_1.6.0.bb => directfb-examples_1.7.0.bb} (78%)
 rename meta/recipes-graphics/directfb/{directfb_1.6.3.bb => directfb_1.7.1.bb} (54%)
 mode change 100755 => 100644
 rename meta/recipes-multimedia/alsa/{alsa-tools_1.0.26.1.bb => alsa-tools_1.0.27.bb} (87%)
 delete mode 100644 meta/recipes-qt/qt-apps/qmmp/no-sessionmanager.patch
 rename meta/recipes-qt/qt-apps/{qmmp_0.6.6.bb => qmmp_0.7.5.bb} (93%)

Signature · 1 line

1.8.1.2

Kai Kang

author

2014-03-12 07:47 UTC #1 lore raw

PATCH 1/5 qmmp: update to 0.7.5

Update qmmp to 0.7.5 version

* update no-host-paths.patch
* remove no-sessionmanager.patch which is merged

Signed-off-by Kai Kang <[email protected]>

---
 meta/recipes-qt/qt-apps/qmmp/no-host-paths.patch    | 13 +++++++------
 .../recipes-qt/qt-apps/qmmp/no-sessionmanager.patch | 21 ---------------------
 .../qt-apps/{qmmp_0.6.6.bb => qmmp_0.7.5.bb}        |  6 +++---
 3 files changed, 10 insertions(+), 30 deletions(-)
 delete mode 100644 meta/recipes-qt/qt-apps/qmmp/no-sessionmanager.patch
 rename meta/recipes-qt/qt-apps/{qmmp_0.6.6.bb => qmmp_0.7.5.bb} (93%)

meta/recipes-qt/qt-apps/qmmp/no-host-paths.patch +7 -6

index de17b4e..2bb5bb11 100644
@@ -8,16 +8,17 @@ Upstream-Status: Inappropriate [cross]
 
 Signed-off-by: Paul Eggleton <[email protected]>
 
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,12 +1,5 @@
+Update patch for version 0.7.4.
+
+Signed-off-by: Kai Kang <[email protected]>
+
+--- qmmp-0.7.4/CMakeLists.txt	2014-01-10 09:59:44.971837746 +0800
++++ qmmp-0.7.4/CMakeLists.txt.new	2014-01-10 10:24:51.855837566 +0800
+@@ -1,9 +1,5 @@
  cmake_minimum_required(VERSION 2.6.0)
  
 -#freebsd support
 -include_directories(SYSTEM /usr/local/include)
--link_directories(/usr/local/lib)
--link_directories(/usr/local/lib32)
--link_directories(/usr/local/lib64)
 -SET(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} /usr/local/include)
 -
  #extract version from qmmp.h

meta/recipes-qt/qt-apps/qmmp/no-sessionmanager.patch deleted +0 ~~-21~~

deleted file mode 100644
index 5e2978b..0000000
@@ -1,21 +0,0 @@
-Don't call session manager function if not enabled
-
-If session management has been disabled we will get a compilation
-failure if we try to call QApplication::commitData() so don't do so if
-it is disabled.
-
-Upstream-Status: Pending
-
-Signed-off-by: Paul Eggleton <[email protected]>
-
---- a/src/app/qmmpapplication.cpp
-+++ b/src/app/qmmpapplication.cpp
-@@ -29,6 +29,8 @@ void QmmpApplication::commitData(QSessionManager &manager)
- {
-     if(UiHelper::instance())
-         UiHelper::instance()->exit();
-+#ifndef QT_NO_SESSIONMANAGER
-     else
-         QApplication::commitData(manager);
-+#endif
- }

meta/recipes-qt/qt-apps/qmmp_0.7.5.bb renamed from meta/recipes-qt/qt-apps/qmmp_0.6.6.bb +3 -3

similarity index 93%
rename from meta/recipes-qt/qt-apps/qmmp_0.6.6.bb
rename to meta/recipes-qt/qt-apps/qmmp_0.7.5.bb
index ddfdfdc..910e7c2 100644
@@ -10,10 +10,10 @@ DEPENDS = "taglib libmad libvorbis libogg alsa-lib libsndfile1 libsamplerate0 cu
 
 SRC_URI = "http://qmmp.ylsoftware.com/files/${BPN}-${PV}.tar.bz2 \
            file://no-host-paths.patch \
-           file://no-sessionmanager.patch"
+          "
 
-SRC_URI[md5sum] = "0131a9bf7b98737c1a6fd6e1a897e2b2"
-SRC_URI[sha256sum] = "dfa973cca80c020a85a11bb66701a3804f9fde326440abb179559c98bf3b5b99"
+SRC_URI[md5sum] = "dcc3c9ecd4dfbf0ced91c59cb894d460"
+SRC_URI[sha256sum] = "6066aea939813667dae7cf32ff1d6eb9913894977d132c2cd729fea22d24cf67"
 
 inherit cmake qt4x11

Signature · 1 line

1.8.1.2

Kai Kang

author

2014-03-12 07:47 UTC #2 lore raw

PATCH 2/5 directfb: update to 1.7.1

In reply to Kai Kang

Update directfb to 1.7.1:
* remove PR
* remove rename-no-instrument-function-macro.patch which is merged

Signed-off-by Kai Kang <[email protected]>

---
 meta/recipes-graphics/directfb/directfb.inc                    |  4 +---
 .../directfb/{directfb_1.6.3.bb => directfb_1.7.1.bb}          | 10 ++++------
 2 files changed, 5 insertions(+), 9 deletions(-)
 rename meta/recipes-graphics/directfb/{directfb_1.6.3.bb => directfb_1.7.1.bb} (54%)
 mode change 100755 => 100644

meta/recipes-graphics/directfb/directfb.inc +1 -3

index a23209f..f2518e9 100644
@@ -11,9 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=dcf3c825659e82539645da41a7908589"
 HOMEPAGE = "http://directfb.org"
 DEPENDS = "jpeg libpng freetype zlib tslib"
 
-INC_PR = "r0"
-
-SRC_URI = "http://directfb.org/downloads/Core/DirectFB-1.6/DirectFB-${PV}.tar.gz \
+SRC_URI = "http://www.directfb.org/downloads/Core/DirectFB-1.7/DirectFB-${PV}.tar.gz \
            file://configurefix.patch \
            file://fusion.patch"

meta/recipes-graphics/directfb/directfb_1.7.1.bb renamed from meta/recipes-graphics/directfb/directfb_1.6.3.bb +4 -6

old mode 100755
new mode 100644
similarity index 54%
rename from meta/recipes-graphics/directfb/directfb_1.6.3.bb
rename to meta/recipes-graphics/directfb/directfb_1.7.1.bb
index 277e9a9..15f38ac
@@ -1,12 +1,10 @@
 require directfb.inc
 
-RV = "1.6-0"
-PR = "${INC_PR}.2"
+RV = "1.7-1"
 
 DEPENDS += "sysfsutils"
 
 SRC_URI += "file://fix-compilation-with-zlib.patch \
-            file://rename-no-instrument-function-macro.patch \
             file://fixsepbuild.patch"
 
 EXTRA_OECONF = "\

@@ -20,7 +18,7 @@ EXTRA_OECONF = "\
   --disable-mesa \
 "
 
-LEAD_SONAME = "libdirectfb-1.6.so.0"
+LEAD_SONAME = "libdirectfb-1.7.so.0"
 
-SRC_URI[md5sum] = "641e8e999c017770da647f9b5b890906"
-SRC_URI[sha256sum] = "7a96aced0f69b2ec0810e9923068e61c21e6b19dd593e09394c872414df75e70"
+SRC_URI[md5sum] = "0ef44c16a414312fd38d6764e2cb9893"
+SRC_URI[sha256sum] = "dd7de38b3cd1408411b37ca28ec73e14b7672e5e28256b7bf91826240c81f519"

Signature · 1 line

1.8.1.2

Kai Kang

author

2014-03-12 07:47 UTC #3 lore raw

PATCH 3/5 directfb-examples: update to 1.7.0

In reply to Kai Kang

Update directfb-examples to latest version 1.7.0.

Signed-off-by Kai Kang <[email protected]>

---
 .../{directfb-examples_1.6.0.bb => directfb-examples_1.7.0.bb}        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-graphics/directfb/{directfb-examples_1.6.0.bb => directfb-examples_1.7.0.bb} (78%)

meta/recipes-graphics/directfb/directfb-examples_1.7.0.bb renamed from meta/recipes-graphics/directfb/directfb-examples_1.6.0.bb +2 -2

similarity index 78%
rename from meta/recipes-graphics/directfb/directfb-examples_1.6.0.bb
rename to meta/recipes-graphics/directfb/directfb-examples_1.7.0.bb
index 499060b..6b4c756 100644
@@ -16,5 +16,5 @@ S = "${WORKDIR}/DirectFB-examples-${PV}"
 
 inherit autotools
 
-SRC_URI[md5sum] = "27619d31e8a647fdd3023a0c1779b63d"
-SRC_URI[sha256sum] = "b08293697c211b690856f76a25ad7acd4ca458b4132851e0a1e471d0bf23c821"
+SRC_URI[md5sum] = "8b60c867af295481c32a8c7fc5802307"
+SRC_URI[sha256sum] = "9a2104cc4da8123c8371813551b66b943198979f745cbebc034bb5e10844122a"

Signature · 1 line

1.8.1.2

Kai Kang

author

2014-03-12 07:47 UTC #4 lore raw

PATCH 4/5 alsa-tools: update to version 1.0.27

In reply to Kai Kang

Update alsa-tools to latest version 1.0.27:

* remove PR
* update autotools.patch
* add build dependency gkt+3 that hdajackretask requires it.

Signed-off-by Kai Kang <[email protected]>

---
 meta/recipes-multimedia/alsa/alsa-tools/autotools.patch   | 15 ++++++---------
 .../alsa/{alsa-tools_1.0.26.1.bb => alsa-tools_1.0.27.bb} |  8 +++-----
 2 files changed, 9 insertions(+), 14 deletions(-)
 rename meta/recipes-multimedia/alsa/{alsa-tools_1.0.26.1.bb => alsa-tools_1.0.27.bb} (87%)

meta/recipes-multimedia/alsa/alsa-tools/autotools.patch +6 -9

index 294e970..5aec84c 100644
@@ -19,17 +19,14 @@ diff -ruN alsa-tools-1.0.24.1-orig//ld10k1/gitcompile alsa-tools-1.0.24.1/ld10k1
 diff -ruN alsa-tools-1.0.24.1-orig//Makefile alsa-tools-1.0.24.1/Makefile
 --- alsa-tools-1.0.24.1-orig//Makefile	2011-07-06 11:27:40.207665000 +0800
 +++ alsa-tools-1.0.24.1/Makefile	2011-07-14 15:08:08.877665009 +0800
-@@ -1,9 +1,9 @@
- VERSION = 1.0.26.1
+@@ -1,8 +1,8 @@
+ VERSION = 1.0.27
  TOP = .
--SUBDIRS = ac3dec as10k1 envy24control hdsploader hdspconf hdspmixer \
--	  mixartloader pcxhrloader rmedigicontrol sb16_csp seq sscape_ctl \
+-SUBDIRS = as10k1 envy24control hdsploader hdspconf hdspmixer \
++SUBDIRS = as10k1 envy24control \
+ 	  mixartloader pcxhrloader rmedigicontrol sb16_csp seq sscape_ctl \
 -	  us428control usx2yloader vxloader echomixer ld10k1 qlo10k1 \
--	  hwmixvolume hdajackretask hda-verb
-+SUBDIRS = ac3dec as10k1 envy24control \
-+	  mixartloader pcxhrloader rmedigicontrol sb16_csp seq sscape_ctl \
 +	  us428control usx2yloader vxloader echomixer \
-+	  hwmixvolume hda-verb
+ 	  hwmixvolume hdajackretask hda-verb
  
  all:
- 	@for i in $(SUBDIRS); do \

meta/recipes-multimedia/alsa/alsa-tools_1.0.27.bb renamed from meta/recipes-multimedia/alsa/alsa-tools_1.0.26.1.bb +3 -5

similarity index 87%
rename from meta/recipes-multimedia/alsa/alsa-tools_1.0.26.1.bb
rename to meta/recipes-multimedia/alsa/alsa-tools_1.0.27.bb
index b154233..b3c02b3 100644
@@ -3,9 +3,7 @@ HOMEPAGE = "http://www.alsa-project.org"
 BUGTRACKER = "https://bugtrack.alsa-project.org/alsa-bug/login_page.php"
 SECTION = "console/utils"
 LICENSE = "GPLv2 & LGPLv2+"
-DEPENDS = "alsa-lib ncurses"
-
-PR = "r1"
+DEPENDS = "alsa-lib ncurses gtk+3"
 
 LIC_FILES_CHKSUM = "file://hdsploader/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
                     file://ld10k1/COPYING.LIB;md5=7fbc338309ac38fefcd64b04bb903e34"

@@ -15,8 +13,8 @@ SRC_URI = "ftp://ftp.alsa-project.org/pub/tools/alsa-tools-${PV}.tar.bz2 \
            file://autotools.patch \
            ${@base_contains('DISTRO_FEATURES', 'x11', '', 'file://makefile_no_gtk.patch', d)}"
 
-SRC_URI[md5sum] = "805526ea5d6c40e1f2c94cee86141230"
-SRC_URI[sha256sum] = "553338693707fe6ddfc430b9edc4cd2677390e200c9e38de82ede3394e733841"
+SRC_URI[md5sum] = "1ea381d00a6069a98613aa7effa4cb51"
+SRC_URI[sha256sum] = "6562611b5a6560712f109e09740a9d4fa47296b07ed9590cb44139c5f154ada2"
 
 inherit autotools-brokensep

Signature · 1 line

1.8.1.2

Kai Kang

author

2014-03-12 07:47 UTC #5 lore raw

PATCH 5/5 libnewt: update to 0.52.17

In reply to Kai Kang

Update libnewt and libnewt-python to 0.52.17.

* remove PR
* update cross_ar.patch and fix_SHAREDDIR.patch that context changed
* remove fix_python_fpic.patch which is merged
* update so file name in libnewt-python recipe

Signed-off-by Kai Kang <[email protected]>

---
 meta/recipes-extended/newt/files/cross_ar.patch      | 16 ++++------------
 meta/recipes-extended/newt/files/fix_SHAREDDIR.patch |  4 ++--
 meta/recipes-extended/newt/libnewt-python_0.52.14.bb |  5 ++---
 meta/recipes-extended/newt/libnewt_0.52.14.bb        | 10 ++++------
 4 files changed, 12 insertions(+), 23 deletions(-)

meta/recipes-extended/newt/files/cross_ar.patch +4 ~~-12~~

index f67239a..2035cc4 100644
@@ -19,16 +19,8 @@ Upstream-Status: Pending
 
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -7,6 +7,7 @@ CFLAGS = @CFLAGS@
- LDFLAGS = @LDFLAGS@
- CPPFLAGS = -D_GNU_SOURCE @CPPFLAGS@ 
- GNU_LD = @GNU_LD@
-+AR = @AR@
- 
- VERSION = @VERSION@
- TAG = r$(subst .,-,$(VERSION))
-@@ -95,7 +96,7 @@ whiptcl.so: $(WHIPTCLOBJS) $(LIBNEWTSH)
- 	$(CC) -shared $(SHCFLAGS) $(LDFLAGS) -o whiptcl.so $(WHIPTCLOBJS) -L. -lnewt  $(LIBTCL) -lpopt $(LIBS)
+@@ -109,7 +109,7 @@
+ 	$(CC) -shared $(SHCFLAGS) $(LDFLAGS) -o whiptcl.$(SOEXT) $(WHIPTCLOBJS) -L. -lnewt  $(LIBTCL) -lpopt $(LIBS)
  
  $(LIBNEWT): $(LIBOBJS)
 -	ar rv $@ $^

@@ -38,10 +30,10 @@ Upstream-Status: Pending
  
 --- a/configure.ac
 +++ b/configure.ac
-@@ -14,6 +14,10 @@ AC_PROG_CC
- AC_PROG_INSTALL
+@@ -15,6 +15,10 @@
  AC_PROG_LN_S
  AC_PROG_GREP
+ AC_SYS_LARGEFILE
 +AN_MAKEVAR([AR], [AC_PROG_AR])
 +AN_PROGRAM([ar], [AC_PROG_AR])
 +AC_DEFUN([AC_PROG_AR], [AC_CHECK_TOOL(AR, ar, :)])

meta/recipes-extended/newt/files/fix_SHAREDDIR.patch +2 -2

index 7795260..1907aef 100644
@@ -12,14 +12,14 @@ Signed-off-by: Dexuan Cui <[email protected]>
 
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -114,12 +114,12 @@
+@@ -128,12 +128,12 @@
  
  sharedlib: $(LIBNEWTSH)
  
 -$(LIBNEWTSH): $(SHAREDDIR) $(SHAREDOBJS)
 +$(LIBNEWTSH): $(SHAREDOBJS)
  	$(CC) -shared -o $(LIBNEWTSH) $(SHLIBFLAGS) $(SHAREDOBJS) $(LDFLAGS) $(LIBS)
- 	ln -fs $(LIBNEWTSONAME) libnewt.so
+ 	ln -fs $(LIBNEWTSONAME) libnewt.$(SOEXT)
  	ln -fs $(LIBNEWTSH) $(LIBNEWTSONAME)
  
 -$(SHAREDDIR)/%.o : %.c

meta/recipes-extended/newt/libnewt-python_0.52.14.bb +2 -3

index 871b195..70ab202 100644
@@ -9,15 +9,14 @@ inherit pythonnative python-dir
 EXTRA_OECONF += "--with-python"
 EXTRA_OEMAKE += "PYTHONVERS=${PYTHON_DIR}"
 
-
 do_compile () {
 	VERSION="$(sed -n 's/^VERSION = //p' Makefile)"
-	oe_runmake "LIBNEWTSH=${STAGING_LIBDIR}/libnewt.so.$VERSION" _snackmodule.so
+	oe_runmake "LIBNEWTSH=${STAGING_LIBDIR}/libnewt.so.$VERSION" _snack.so
 }
 
 do_install () {
 	install -d ${D}${PYTHON_SITEPACKAGES_DIR}
-	install -m 0755 ${PYTHON_DIR}/_snackmodule.so ${D}${PYTHON_SITEPACKAGES_DIR}/
+	install -m 0755 ${PYTHON_DIR}/_snack.so ${D}${PYTHON_SITEPACKAGES_DIR}/
 	install -m 0644 snack.py ${D}${PYTHON_SITEPACKAGES_DIR}/
 }

meta/recipes-extended/newt/libnewt_0.52.14.bb +4 -6

index 65bcf40..46598e6 100644
@@ -12,21 +12,19 @@ HOMEPAGE = "https://fedorahosted.org/newt/"
 SECTION = "libs"
 
 LICENSE = "LGPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605"
+LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2"
 
 # slang needs to be >= 2.2
 DEPENDS = "slang popt"
 
-PR = "r2"
-
 SRC_URI = "https://fedorahosted.org/releases/n/e/newt/newt-${PV}.tar.gz \
            file://remove_slang_include.patch \
            file://fix_SHAREDDIR.patch \
            file://cross_ar.patch \
-           file://fix_python_fpic.patch"
+          "
 
-SRC_URI[md5sum] = "eb78c6bb658b92ec7198908b5b8d0e37"
-SRC_URI[sha256sum] = "f70f4f58baa60388ddf2e39249ffb00898fb40f2b2767e42e2ab51fe4b40978e"
+SRC_URI[md5sum] = "f36d4d908965a0c89fd6fd8b61a6118b"
+SRC_URI[sha256sum] = "69837973ef2ee2fa644426f1c3e48d2b18785ebcd382ef7fd01eb2e67d2d632b"
 
 S = "${WORKDIR}/newt-${PV}"

Signature · 1 line

1.8.1.2

Kang Kai

author

2014-03-20 06:33 UTC #6 lore raw

Re: [PATCH 5/5] libnewt: update to 0.52.17

Quoted 114 lines · Kai Kang

Update libnewt and libnewt-python to 0.52.17.

* remove PR
* update cross_ar.patch and fix_SHAREDDIR.patch that context changed
* remove fix_python_fpic.patch which is merged
* update so file name in libnewt-python recipe

Signed-off-by Kai Kang <[email protected]>

---
  meta/recipes-extended/newt/files/cross_ar.patch      | 16 ++++------------
  meta/recipes-extended/newt/files/fix_SHAREDDIR.patch |  4 ++--
  meta/recipes-extended/newt/libnewt-python_0.52.14.bb |  5 ++---
  meta/recipes-extended/newt/libnewt_0.52.14.bb        | 10 ++++------
  4 files changed, 12 insertions(+), 23 deletions(-)

meta/recipes-extended/newt/files/cross_ar.patch +4 ~~-12~~

index f67239a..2035cc4 100644
@@ -19,16 +19,8 @@ Upstream-Status: Pending
 
  --- a/Makefile.in
  +++ b/Makefile.in
-@@ -7,6 +7,7 @@ CFLAGS = @CFLAGS@
- LDFLAGS = @LDFLAGS@
- CPPFLAGS = -D_GNU_SOURCE @CPPFLAGS@
- GNU_LD = @GNU_LD@
-+AR = @AR@
-
- VERSION = @VERSION@
- TAG = r$(subst .,-,$(VERSION))
-@@ -95,7 +96,7 @@ whiptcl.so: $(WHIPTCLOBJS) $(LIBNEWTSH)
- 	$(CC) -shared $(SHCFLAGS) $(LDFLAGS) -o whiptcl.so $(WHIPTCLOBJS) -L. -lnewt  $(LIBTCL) -lpopt $(LIBS)
+@@ -109,7 +109,7 @@
+ 	$(CC) -shared $(SHCFLAGS) $(LDFLAGS) -o whiptcl.$(SOEXT) $(WHIPTCLOBJS) -L. -lnewt  $(LIBTCL) -lpopt $(LIBS)
 
   $(LIBNEWT): $(LIBOBJS)
  -	ar rv $@ $^

@@ -38,10 +30,10 @@ Upstream-Status: Pending
 
  --- a/configure.ac
  +++ b/configure.ac
-@@ -14,6 +14,10 @@ AC_PROG_CC
- AC_PROG_INSTALL
+@@ -15,6 +15,10 @@
   AC_PROG_LN_S
   AC_PROG_GREP
+ AC_SYS_LARGEFILE
  +AN_MAKEVAR([AR], [AC_PROG_AR])
  +AN_PROGRAM([ar], [AC_PROG_AR])
  +AC_DEFUN([AC_PROG_AR], [AC_CHECK_TOOL(AR, ar, :)])

meta/recipes-extended/newt/files/fix_SHAREDDIR.patch +2 -2

index 7795260..1907aef 100644
@@ -12,14 +12,14 @@ Signed-off-by: Dexuan Cui <[email protected]>
 
  --- a/Makefile.in
  +++ b/Makefile.in
-@@ -114,12 +114,12 @@
+@@ -128,12 +128,12 @@
 
   sharedlib: $(LIBNEWTSH)
 
  -$(LIBNEWTSH): $(SHAREDDIR) $(SHAREDOBJS)
  +$(LIBNEWTSH): $(SHAREDOBJS)
   	$(CC) -shared -o $(LIBNEWTSH) $(SHLIBFLAGS) $(SHAREDOBJS) $(LDFLAGS) $(LIBS)
- 	ln -fs $(LIBNEWTSONAME) libnewt.so
+ 	ln -fs $(LIBNEWTSONAME) libnewt.$(SOEXT)
   	ln -fs $(LIBNEWTSH) $(LIBNEWTSONAME)
 
  -$(SHAREDDIR)/%.o : %.c

meta/recipes-extended/newt/libnewt-python_0.52.14.bb +2 -3

index 871b195..70ab202 100644
@@ -9,15 +9,14 @@ inherit pythonnative python-dir
  EXTRA_OECONF += "--with-python"
  EXTRA_OEMAKE += "PYTHONVERS=${PYTHON_DIR}"
 
-
  do_compile () {
  	VERSION="$(sed -n 's/^VERSION = //p' Makefile)"
-	oe_runmake "LIBNEWTSH=${STAGING_LIBDIR}/libnewt.so.$VERSION" _snackmodule.so
+	oe_runmake "LIBNEWTSH=${STAGING_LIBDIR}/libnewt.so.$VERSION" _snack.so
  }
 
  do_install () {
  	install -d ${D}${PYTHON_SITEPACKAGES_DIR}
-	install -m 0755 ${PYTHON_DIR}/_snackmodule.so ${D}${PYTHON_SITEPACKAGES_DIR}/
+	install -m 0755 ${PYTHON_DIR}/_snack.so ${D}${PYTHON_SITEPACKAGES_DIR}/
  	install -m 0644 snack.py ${D}${PYTHON_SITEPACKAGES_DIR}/
  }

meta/recipes-extended/newt/libnewt_0.52.14.bb +1 -3

index 65bcf40..46598e6 100644
@@ -12,21 +12,19 @@ HOMEPAGE = "https://fedorahosted.org/newt/"
  SECTION = "libs"
 
  LICENSE = "LGPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605"
+LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2"
 
  # slang needs to be >= 2.2
  DEPENDS = "slang popt"
 
-PR = "r2"
-
  SRC_URI = "https://fedorahosted.org/releases/n/e/newt/newt-${PV}.tar.gz \
             file://remove_slang_include.patch \
             file://fix_SHAREDDIR.patch \
             file://cross_ar.patch \

meta/recipes-extended/newt/libnewt_0.52.14.bb HOMEPAGE = "https://fedorahosted.org/newt/" · line 30

Quoted 10 lines

meta/recipes-extended/newt/libnewt_0.52.14.bb +3 -3

-           file://fix_python_fpic.patch"
+          "
 
-SRC_URI[md5sum] = "eb78c6bb658b92ec7198908b5b8d0e37"
-SRC_URI[sha256sum] = "f70f4f58baa60388ddf2e39249ffb00898fb40f2b2767e42e2ab51fe4b40978e"
+SRC_URI[md5sum] = "f36d4d908965a0c89fd6fd8b61a6118b"
+SRC_URI[sha256sum] = "69837973ef2ee2fa644426f1c3e48d2b18785ebcd382ef7fd01eb2e67d2d632b"
 
  S = "${WORKDIR}/newt-${PV}"

Hi Saul,

Any comment on libnewt commit? I notice other patches in this serial are merged except libnewt.

Thanks,

Signature · 2 lines

Regards,
Neil | Kai Kang

Richard Purdie

2014-03-20 11:28 UTC #7 lore raw

Re: [PATCH 5/5] libnewt: update to 0.52.17

Quoted 123 lines · Kang Kai

Quoted 122 lines · Kai Kang

Update libnewt and libnewt-python to 0.52.17.

* remove PR
* update cross_ar.patch and fix_SHAREDDIR.patch that context changed
* remove fix_python_fpic.patch which is merged
* update so file name in libnewt-python recipe

Signed-off-by Kai Kang <[email protected]>

---
  meta/recipes-extended/newt/files/cross_ar.patch      | 16 ++++------------
  meta/recipes-extended/newt/files/fix_SHAREDDIR.patch |  4 ++--
  meta/recipes-extended/newt/libnewt-python_0.52.14.bb |  5 ++---
  meta/recipes-extended/newt/libnewt_0.52.14.bb        | 10 ++++------
  4 files changed, 12 insertions(+), 23 deletions(-)

meta/recipes-extended/newt/files/cross_ar.patch +4 ~~-12~~

index f67239a..2035cc4 100644
@@ -19,16 +19,8 @@ Upstream-Status: Pending
 
  --- a/Makefile.in
  +++ b/Makefile.in
-@@ -7,6 +7,7 @@ CFLAGS = @CFLAGS@
- LDFLAGS = @LDFLAGS@
- CPPFLAGS = -D_GNU_SOURCE @CPPFLAGS@
- GNU_LD = @GNU_LD@
-+AR = @AR@
-
- VERSION = @VERSION@
- TAG = r$(subst .,-,$(VERSION))
-@@ -95,7 +96,7 @@ whiptcl.so: $(WHIPTCLOBJS) $(LIBNEWTSH)
- 	$(CC) -shared $(SHCFLAGS) $(LDFLAGS) -o whiptcl.so $(WHIPTCLOBJS) -L. -lnewt  $(LIBTCL) -lpopt $(LIBS)
+@@ -109,7 +109,7 @@
+ 	$(CC) -shared $(SHCFLAGS) $(LDFLAGS) -o whiptcl.$(SOEXT) $(WHIPTCLOBJS) -L. -lnewt  $(LIBTCL) -lpopt $(LIBS)
 
   $(LIBNEWT): $(LIBOBJS)
  -	ar rv $@ $^

@@ -38,10 +30,10 @@ Upstream-Status: Pending
 
  --- a/configure.ac
  +++ b/configure.ac
-@@ -14,6 +14,10 @@ AC_PROG_CC
- AC_PROG_INSTALL
+@@ -15,6 +15,10 @@
   AC_PROG_LN_S
   AC_PROG_GREP
+ AC_SYS_LARGEFILE
  +AN_MAKEVAR([AR], [AC_PROG_AR])
  +AN_PROGRAM([ar], [AC_PROG_AR])
  +AC_DEFUN([AC_PROG_AR], [AC_CHECK_TOOL(AR, ar, :)])

meta/recipes-extended/newt/files/fix_SHAREDDIR.patch +2 -2

index 7795260..1907aef 100644
@@ -12,14 +12,14 @@ Signed-off-by: Dexuan Cui <[email protected]>
 
  --- a/Makefile.in
  +++ b/Makefile.in
-@@ -114,12 +114,12 @@
+@@ -128,12 +128,12 @@
 
   sharedlib: $(LIBNEWTSH)
 
  -$(LIBNEWTSH): $(SHAREDDIR) $(SHAREDOBJS)
  +$(LIBNEWTSH): $(SHAREDOBJS)
   	$(CC) -shared -o $(LIBNEWTSH) $(SHLIBFLAGS) $(SHAREDOBJS) $(LDFLAGS) $(LIBS)
- 	ln -fs $(LIBNEWTSONAME) libnewt.so
+ 	ln -fs $(LIBNEWTSONAME) libnewt.$(SOEXT)
   	ln -fs $(LIBNEWTSH) $(LIBNEWTSONAME)
 
  -$(SHAREDDIR)/%.o : %.c

meta/recipes-extended/newt/libnewt-python_0.52.14.bb +2 -3

index 871b195..70ab202 100644
@@ -9,15 +9,14 @@ inherit pythonnative python-dir
  EXTRA_OECONF += "--with-python"
  EXTRA_OEMAKE += "PYTHONVERS=${PYTHON_DIR}"
 
-
  do_compile () {
  	VERSION="$(sed -n 's/^VERSION = //p' Makefile)"
-	oe_runmake "LIBNEWTSH=${STAGING_LIBDIR}/libnewt.so.$VERSION" _snackmodule.so
+	oe_runmake "LIBNEWTSH=${STAGING_LIBDIR}/libnewt.so.$VERSION" _snack.so
  }
 
  do_install () {
  	install -d ${D}${PYTHON_SITEPACKAGES_DIR}
-	install -m 0755 ${PYTHON_DIR}/_snackmodule.so ${D}${PYTHON_SITEPACKAGES_DIR}/
+	install -m 0755 ${PYTHON_DIR}/_snack.so ${D}${PYTHON_SITEPACKAGES_DIR}/
  	install -m 0644 snack.py ${D}${PYTHON_SITEPACKAGES_DIR}/
  }

meta/recipes-extended/newt/libnewt_0.52.14.bb +4 -6

index 65bcf40..46598e6 100644
@@ -12,21 +12,19 @@ HOMEPAGE = "https://fedorahosted.org/newt/"
  SECTION = "libs"
 
  LICENSE = "LGPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605"
+LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2"
 
  # slang needs to be >= 2.2
  DEPENDS = "slang popt"
 
-PR = "r2"
-
  SRC_URI = "https://fedorahosted.org/releases/n/e/newt/newt-${PV}.tar.gz \
             file://remove_slang_include.patch \
             file://fix_SHAREDDIR.patch \
             file://cross_ar.patch \
-           file://fix_python_fpic.patch"
+          "
 
-SRC_URI[md5sum] = "eb78c6bb658b92ec7198908b5b8d0e37"
-SRC_URI[sha256sum] = "f70f4f58baa60388ddf2e39249ffb00898fb40f2b2767e42e2ab51fe4b40978e"
+SRC_URI[md5sum] = "f36d4d908965a0c89fd6fd8b61a6118b"
+SRC_URI[sha256sum] = "69837973ef2ee2fa644426f1c3e48d2b18785ebcd382ef7fd01eb2e67d2d632b"

Quoted 4 lines

meta/recipes-extended/newt/libnewt_0.52.14.bb HOMEPAGE = "https://fedorahosted.org/newt/" · line 29
Quoted 1 line
meta/recipes-extended/newt/libnewt_0.52.14.bb +0 -0
  S = "${WORKDIR}/newt-${PV}"
Any comment on libnewt commit? I notice other patches in this serial are merged except libnewt.

It broke builds:

http://autobuilder.yoctoproject.org/main/builders/minnow-lsb/builds/89/steps/BuildImages/logs/stdio

Your patch header talks about .17 but the patch only modifies .14...

Cheers,

Richard

Kang Kai

author

2014-03-21 02:08 UTC #8 lore raw

Re: [PATCH 5/5] libnewt: update to 0.52.17

Quoted 124 lines · Richard Purdie

Quoted 123 lines · Kang Kai

Quoted 122 lines · Kai Kang

Update libnewt and libnewt-python to 0.52.17.

* remove PR
* update cross_ar.patch and fix_SHAREDDIR.patch that context changed
* remove fix_python_fpic.patch which is merged
* update so file name in libnewt-python recipe

Signed-off-by Kai Kang <[email protected]>

---
   meta/recipes-extended/newt/files/cross_ar.patch      | 16 ++++------------
   meta/recipes-extended/newt/files/fix_SHAREDDIR.patch |  4 ++--
   meta/recipes-extended/newt/libnewt-python_0.52.14.bb |  5 ++---
   meta/recipes-extended/newt/libnewt_0.52.14.bb        | 10 ++++------
   4 files changed, 12 insertions(+), 23 deletions(-)

meta/recipes-extended/newt/files/cross_ar.patch +4 ~~-12~~

index f67239a..2035cc4 100644
@@ -19,16 +19,8 @@ Upstream-Status: Pending
 
   --- a/Makefile.in
   +++ b/Makefile.in
-@@ -7,6 +7,7 @@ CFLAGS = @CFLAGS@
- LDFLAGS = @LDFLAGS@
- CPPFLAGS = -D_GNU_SOURCE @CPPFLAGS@
- GNU_LD = @GNU_LD@
-+AR = @AR@
-
- VERSION = @VERSION@
- TAG = r$(subst .,-,$(VERSION))
-@@ -95,7 +96,7 @@ whiptcl.so: $(WHIPTCLOBJS) $(LIBNEWTSH)
- 	$(CC) -shared $(SHCFLAGS) $(LDFLAGS) -o whiptcl.so $(WHIPTCLOBJS) -L. -lnewt  $(LIBTCL) -lpopt $(LIBS)
+@@ -109,7 +109,7 @@
+ 	$(CC) -shared $(SHCFLAGS) $(LDFLAGS) -o whiptcl.$(SOEXT) $(WHIPTCLOBJS) -L. -lnewt  $(LIBTCL) -lpopt $(LIBS)
 
    $(LIBNEWT): $(LIBOBJS)
   -	ar rv $@ $^

@@ -38,10 +30,10 @@ Upstream-Status: Pending
 
   --- a/configure.ac
   +++ b/configure.ac
-@@ -14,6 +14,10 @@ AC_PROG_CC
- AC_PROG_INSTALL
+@@ -15,6 +15,10 @@
    AC_PROG_LN_S
    AC_PROG_GREP
+ AC_SYS_LARGEFILE
   +AN_MAKEVAR([AR], [AC_PROG_AR])
   +AN_PROGRAM([ar], [AC_PROG_AR])
   +AC_DEFUN([AC_PROG_AR], [AC_CHECK_TOOL(AR, ar, :)])

meta/recipes-extended/newt/files/fix_SHAREDDIR.patch +2 -2

index 7795260..1907aef 100644
@@ -12,14 +12,14 @@ Signed-off-by: Dexuan Cui <[email protected]>
 
   --- a/Makefile.in
   +++ b/Makefile.in
-@@ -114,12 +114,12 @@
+@@ -128,12 +128,12 @@
 
    sharedlib: $(LIBNEWTSH)
 
   -$(LIBNEWTSH): $(SHAREDDIR) $(SHAREDOBJS)
   +$(LIBNEWTSH): $(SHAREDOBJS)
    	$(CC) -shared -o $(LIBNEWTSH) $(SHLIBFLAGS) $(SHAREDOBJS) $(LDFLAGS) $(LIBS)
- 	ln -fs $(LIBNEWTSONAME) libnewt.so
+ 	ln -fs $(LIBNEWTSONAME) libnewt.$(SOEXT)
    	ln -fs $(LIBNEWTSH) $(LIBNEWTSONAME)
 
   -$(SHAREDDIR)/%.o : %.c

meta/recipes-extended/newt/libnewt-python_0.52.14.bb +2 -3

index 871b195..70ab202 100644
@@ -9,15 +9,14 @@ inherit pythonnative python-dir
   EXTRA_OECONF += "--with-python"
   EXTRA_OEMAKE += "PYTHONVERS=${PYTHON_DIR}"
 
-
   do_compile () {
   	VERSION="$(sed -n 's/^VERSION = //p' Makefile)"
-	oe_runmake "LIBNEWTSH=${STAGING_LIBDIR}/libnewt.so.$VERSION" _snackmodule.so
+	oe_runmake "LIBNEWTSH=${STAGING_LIBDIR}/libnewt.so.$VERSION" _snack.so
   }
 
   do_install () {
   	install -d ${D}${PYTHON_SITEPACKAGES_DIR}
-	install -m 0755 ${PYTHON_DIR}/_snackmodule.so ${D}${PYTHON_SITEPACKAGES_DIR}/
+	install -m 0755 ${PYTHON_DIR}/_snack.so ${D}${PYTHON_SITEPACKAGES_DIR}/
   	install -m 0644 snack.py ${D}${PYTHON_SITEPACKAGES_DIR}/
   }

meta/recipes-extended/newt/libnewt_0.52.14.bb +4 -6

index 65bcf40..46598e6 100644
@@ -12,21 +12,19 @@ HOMEPAGE = "https://fedorahosted.org/newt/"
   SECTION = "libs"
 
   LICENSE = "LGPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605"
+LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2"
 
   # slang needs to be >= 2.2
   DEPENDS = "slang popt"
 
-PR = "r2"
-
   SRC_URI = "https://fedorahosted.org/releases/n/e/newt/newt-${PV}.tar.gz \
              file://remove_slang_include.patch \
              file://fix_SHAREDDIR.patch \
              file://cross_ar.patch \
-           file://fix_python_fpic.patch"
+          "
 
-SRC_URI[md5sum] = "eb78c6bb658b92ec7198908b5b8d0e37"
-SRC_URI[sha256sum] = "f70f4f58baa60388ddf2e39249ffb00898fb40f2b2767e42e2ab51fe4b40978e"
+SRC_URI[md5sum] = "f36d4d908965a0c89fd6fd8b61a6118b"
+SRC_URI[sha256sum] = "69837973ef2ee2fa644426f1c3e48d2b18785ebcd382ef7fd01eb2e67d2d632b"

Quoted 8 lines

Quoted 3 lines
meta/recipes-extended/newt/libnewt_0.52.14.bb HOMEPAGE = "https://fedorahosted.org/newt/" · line 29
Quoted 1 line
meta/recipes-extended/newt/libnewt_0.52.14.bb +0 -0
   S = "${WORKDIR}/newt-${PV}"
Any comment on libnewt commit? I notice other patches in this serial are merged except libnewt.
It broke builds:
http://autobuilder.yoctoproject.org/main/builders/minnow-lsb/builds/89/steps/BuildImages/logs/stdio
Your patch header talks about .17 but the patch only modifies .14...

Silly error. I built them for 3 different machines and I'll check it. Sorry.

--Kai

Quoted 7 lines

Cheers,
Richard

Signature · 2 lines

Regards,
Neil | Kai Kang