upgrade: libnewt/libnewt-python/directfb/qmmp

PATCH New Hongxu Jia 1 participant 5 messages Jun 17, 2014

lore

Share & tools

lore

Hongxu Jia

author

2014-06-17 07:01 UTC #0 lore raw

cover upgrade: libnewt/libnewt-python/directfb/qmmp

The following changes since commit 3a88df915831f2fd5e46ed71b21190398d1de0f1:

alsa-tools: Add missing pkgconfg dependency (2014-06-14 08:46:02 +0100)

are available in the git repository at:

git://git.pokylinux.org/poky-contrib hongxu/upgrade-20140617
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=hongxu/upgrade-20140617

Hongxu Jia (4):
libnewt/libnewt-python: upgrade to 0.52.17
directfb: upgrade to 1.7.4
qmmp: upgrade to 0.7.7
maintainers: Update directfb/ghostscript/libnewt/qmmp ownership

 meta-yocto/conf/distro/include/maintainers.inc     | 10 ++++-----
 meta/recipes-extended/newt/files/cross_ar.patch    | 19 +++++++++++------
 .../newt/files/fix_SHAREDDIR.patch                 | 12 +++++++++--
 .../newt/files/fix_python_fpic.patch               | 24 ----------------------
 ...python_0.52.14.bb => libnewt-python_0.52.17.bb} |  4 ++--
 .../{libnewt_0.52.14.bb => libnewt_0.52.17.bb}     |  8 ++++----
 .../{directfb_1.7.1.bb => directfb_1.7.4.bb}       |  6 +++---
 .../qt-apps/{qmmp_0.7.5.bb => qmmp_0.7.7.bb}       |  4 ++--
 8 files changed, 39 insertions(+), 48 deletions(-)
 delete mode 100644 meta/recipes-extended/newt/files/fix_python_fpic.patch
 rename meta/recipes-extended/newt/{libnewt-python_0.52.14.bb => libnewt-python_0.52.17.bb} (87%)
 rename meta/recipes-extended/newt/{libnewt_0.52.14.bb => libnewt_0.52.17.bb} (81%)
 rename meta/recipes-graphics/directfb/{directfb_1.7.1.bb => directfb_1.7.4.bb} (70%)
 rename meta/recipes-qt/qt-apps/{qmmp_0.7.5.bb => qmmp_0.7.7.bb} (95%)

Signature · 1 line

1.8.1.2

Hongxu Jia

author

2014-06-17 07:01 UTC #1 lore raw

PATCH 1/4 libnewt/libnewt-python: upgrade to 0.52.17

- The company address has changed in COPYING.

- Rebase fix_SHAREDDIR.patch to 0.52.17

- Rebase cross_ar.patch to 0.52.17

- Obsolete fix_python_fpic.patch, since the patch has been merged by upstream;

- The upstream rename snackmodule to snack in 0.52.17, so tweak libnewt-python_0.52.17.bb;

Signed-off-by Hongxu Jia <[email protected]>

---
 meta/recipes-extended/newt/files/cross_ar.patch    | 19 +++++++++++------
 .../newt/files/fix_SHAREDDIR.patch                 | 12 +++++++++--
 .../newt/files/fix_python_fpic.patch               | 24 ----------------------
 ...python_0.52.14.bb => libnewt-python_0.52.17.bb} |  4 ++--
 .../{libnewt_0.52.14.bb => libnewt_0.52.17.bb}     |  8 ++++----
 5 files changed, 29 insertions(+), 38 deletions(-)
 delete mode 100644 meta/recipes-extended/newt/files/fix_python_fpic.patch
 rename meta/recipes-extended/newt/{libnewt-python_0.52.14.bb => libnewt-python_0.52.17.bb} (87%)
 rename meta/recipes-extended/newt/{libnewt_0.52.14.bb => libnewt_0.52.17.bb} (81%)

meta/recipes-extended/newt/files/cross_ar.patch +13 -6

index f67239a..03007aa 100644
@@ -12,11 +12,13 @@ Signed-off-by: Jason Wessel <[email protected]>
 
 Upstream-Status: Pending
 
+Signed-off-by: Hongxu Jia <[email protected]>
 ---
- Makefile.in  |    3 ++-
- configure.ac |    4 ++++
+ Makefile.in  | 3 ++-
+ configure.ac | 4 ++++
  2 files changed, 6 insertions(+), 1 deletion(-)
 
+diff --git a/Makefile.in b/Makefile.in
 --- a/Makefile.in
 +++ b/Makefile.in
 @@ -7,6 +7,7 @@ CFLAGS = @CFLAGS@

@@ -27,8 +29,8 @@ Upstream-Status: Pending
  
  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 +110,7 @@ whiptcl.$(SOEXT): $(WHIPTCLOBJS) $(LIBNEWTSH)
+ 	$(CC) -shared $(SHCFLAGS) $(LDFLAGS) -o whiptcl.$(SOEXT) $(WHIPTCLOBJS) -L. -lnewt  $(LIBTCL) -lpopt $(LIBS)
  
  $(LIBNEWT): $(LIBOBJS)
 -	ar rv $@ $^

@@ -36,12 +38,14 @@ Upstream-Status: Pending
  
  newt.o $(SHAREDDIR)/newt.o: newt.c Makefile
  
+diff --git a/configure.ac b/configure.ac
+index 92e6da8..cd83d57 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -14,6 +14,10 @@ AC_PROG_CC
- AC_PROG_INSTALL
+@@ -15,6 +15,10 @@ AC_PROG_INSTALL
  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, :)])

@@ -49,3 +53,6 @@ Upstream-Status: Pending
  
  # Are we using GNU ld?
  AC_MSG_CHECKING([for GNU ld])
+-- 
+1.8.1.2
+

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

index 7795260..b0a1e8c 100644
@@ -9,17 +9,22 @@ ensure the directory ${SHAREDDIR} exists.
 We need to push the patch to upstream.
 
 Signed-off-by: Dexuan Cui <[email protected]>
+Signed-off-by: Hongxu Jia <[email protected]>
+---
+ Makefile.in | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
+diff --git a/Makefile.in b/Makefile.in
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -114,12 +114,12 @@
+@@ -128,12 +128,12 @@ $(SHAREDDIR):
  
  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

@@ -27,3 +32,6 @@ Signed-off-by: Dexuan Cui <[email protected]>
  	$(CC) $(SHCFLAGS) -c $(CFLAGS) $(CPPFLAGS) -o $@ $<
  
  install: $(LIBNEWT) install-sh whiptail
+-- 
+1.8.1.2
+

meta/recipes-extended/newt/files/fix_python_fpic.patch deleted +0 ~~-24~~

deleted file mode 100644
index 3ef94e0..0000000
@@ -1,24 +0,0 @@
-Fix relocations warning when compile python module
-
-After enable python support in newt, bitbake complains warning:
-
-WARNING: QA Issue: ELF binary '/mnt/sda10/poky-all-platform/build/tmp/work/i586-poky-linux/libnewt/0.52.14-r2/packages-split/libnewt-python/usr/lib/python2.7/site-packages/_snackmodule.so' has relocations in .text
-
-Add flag -fPIC to compile _snackmodule.so to fix the warning.
-
-Signed-off-by: Kang Kai <[email protected]>
-
-Upstream-Status: Pending
-
----
---- newt-0.52.14/Makefile.in	2012-12-04 17:27:27.578915801 +0800
-+++ newt-0.52.14/Makefile.in.new	2012-12-04 17:28:43.274918472 +0800
-@@ -84,7 +84,7 @@
- 			PIFLAGS=`$$ver-config --includes`; \
- 			PLDFLAGS=`$$ver-config --ldflags`; \
- 			PLFLAGS=`$$ver-config --libs`; \
--	        $(CC) $(CPPFLAGS) $$PIFLAGS $$PCFLAGS -c -o $$ver/snackmodule.o snackmodule.c ;\
-+	        $(CC) $(SHCFLAGS) $(CPPFLAGS) $$PIFLAGS $$PCFLAGS -c -o $$ver/snackmodule.o snackmodule.c ;\
- 	        $(CC) --shared $$PLDFLAGS $$PLFLAGS $(LDFLAGS) -o $$ver/_snackmodule.so $$ver/snackmodule.o -L.  -lnewt $(LIBS);\
- 	done || :
- 	touch $@

meta/recipes-extended/newt/libnewt-python_0.52.17.bb renamed from meta/recipes-extended/newt/libnewt-python_0.52.14.bb +2 -2

similarity index 87%
rename from meta/recipes-extended/newt/libnewt-python_0.52.14.bb
rename to meta/recipes-extended/newt/libnewt-python_0.52.17.bb
index 871b195..d591fbd 100644
@@ -12,12 +12,12 @@ 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.17.bb renamed from meta/recipes-extended/newt/libnewt_0.52.14.bb +4 -4

similarity index 81%
rename from meta/recipes-extended/newt/libnewt_0.52.14.bb
rename to meta/recipes-extended/newt/libnewt_0.52.17.bb
index 65bcf40..09b017e 100644
@@ -12,7 +12,7 @@ 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"

@@ -23,10 +23,10 @@ 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

Hongxu Jia

author

2014-06-17 07:01 UTC #2 lore raw

PATCH 2/4 directfb: upgrade to 1.7.4

In reply to Hongxu Jia

Signed-off-by Hongxu Jia <[email protected]>

---
 .../directfb/{directfb_1.7.1.bb => directfb_1.7.4.bb}               | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 rename meta/recipes-graphics/directfb/{directfb_1.7.1.bb => directfb_1.7.4.bb} (70%)

meta/recipes-graphics/directfb/directfb_1.7.4.bb renamed from meta/recipes-graphics/directfb/directfb_1.7.1.bb +3 -3

similarity index 70%
rename from meta/recipes-graphics/directfb/directfb_1.7.1.bb
rename to meta/recipes-graphics/directfb/directfb_1.7.4.bb
index 15f38ac..512df68 100644
@@ -1,6 +1,6 @@
 require directfb.inc
 
-RV = "1.7-1"
+RV = "1.7-4"
 
 DEPENDS += "sysfsutils"

@@ -20,5 +20,5 @@ EXTRA_OECONF = "\
 
 LEAD_SONAME = "libdirectfb-1.7.so.0"
 
-SRC_URI[md5sum] = "0ef44c16a414312fd38d6764e2cb9893"
-SRC_URI[sha256sum] = "dd7de38b3cd1408411b37ca28ec73e14b7672e5e28256b7bf91826240c81f519"
+SRC_URI[md5sum] = "f5bdacde77fc653279819796ae11341e"
+SRC_URI[sha256sum] = "20ccd60011c788e50c940ab566943d050679067bc84dc37ca447f1b4af08481b"

Signature · 1 line

1.8.1.2

Hongxu Jia

author

2014-06-17 07:01 UTC #3 lore raw

PATCH 3/4 qmmp: upgrade to 0.7.7

In reply to Hongxu Jia

Build:
1) Add LICENSE_FLAGS_WHITELIST += "commercial" to local.conf

2) bitbake qmmp

Signed-off-by Hongxu Jia <[email protected]>

---
 meta/recipes-qt/qt-apps/{qmmp_0.7.5.bb => qmmp_0.7.7.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-qt/qt-apps/{qmmp_0.7.5.bb => qmmp_0.7.7.bb} (95%)

meta/recipes-qt/qt-apps/qmmp_0.7.7.bb renamed from meta/recipes-qt/qt-apps/qmmp_0.7.5.bb +2 -2

similarity index 95%
rename from meta/recipes-qt/qt-apps/qmmp_0.7.5.bb
rename to meta/recipes-qt/qt-apps/qmmp_0.7.7.bb
index 910e7c2..9725b42 100644
@@ -12,8 +12,8 @@ SRC_URI = "http://qmmp.ylsoftware.com/files/${BPN}-${PV}.tar.bz2 \
            file://no-host-paths.patch \
           "
 
-SRC_URI[md5sum] = "dcc3c9ecd4dfbf0ced91c59cb894d460"
-SRC_URI[sha256sum] = "6066aea939813667dae7cf32ff1d6eb9913894977d132c2cd729fea22d24cf67"
+SRC_URI[md5sum] = "9376b5d535ed540e97bdff79b42607ae"
+SRC_URI[sha256sum] = "dda66bf60121a8a2cb7175b16b3b948099f8c119ee9a11c671555e8c38caa387"
 
 inherit cmake qt4x11

Signature · 1 line

1.8.1.2

Hongxu Jia

author

2014-06-17 07:01 UTC #4 lore raw

PATCH 4/4 maintainers: Update directfb/ghostscript/libnewt/qmmp ownership

In reply to Hongxu Jia

Signed-off-by Hongxu Jia <[email protected]>

---
 meta-yocto/conf/distro/include/maintainers.inc | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

meta-yocto/conf/distro/include/maintainers.inc +5 -5

index 17412ca..4d2f46b 100644
@@ -130,8 +130,8 @@ RECIPE_MAINTAINER_pn-desktop-file-utils-native = "Saul Wold <[email protected]
 RECIPE_MAINTAINER_pn-dhcp = "Saul Wold <[email protected]>"
 RECIPE_MAINTAINER_pn-diffstat = "Chong Lu <[email protected]>"
 RECIPE_MAINTAINER_pn-diffutils = "Chong Lu <[email protected]>"
-RECIPE_MAINTAINER_pn-directfb-examples = "Kai Kang <[email protected]>"
-RECIPE_MAINTAINER_pn-directfb = "Kai Kang <[email protected]>"
+RECIPE_MAINTAINER_pn-directfb-examples = "Hongxu Jia <[email protected]>"
+RECIPE_MAINTAINER_pn-directfb = "Hongxu Jia <[email protected]>"
 RECIPE_MAINTAINER_pn-distcc = "Hongxu Jia <[email protected]>"
 RECIPE_MAINTAINER_pn-distcc-config = "Paul Eggleton <[email protected]>"
 RECIPE_MAINTAINER_pn-dmxproto = "Ross Burton <[email protected]>"

@@ -186,7 +186,7 @@ RECIPE_MAINTAINER_pn-gdk-pixbuf = "Ross Burton <[email protected]>"
 RECIPE_MAINTAINER_pn-genext2fs = "Robert Yang <[email protected]>"
 RECIPE_MAINTAINER_pn-gettext-minimal-native = "Saul Wold <[email protected]>"
 RECIPE_MAINTAINER_pn-gettext = "Wenzong Fan <[email protected]>"
-RECIPE_MAINTAINER_pn-ghostscript = "Kai Kang <[email protected]>"
+RECIPE_MAINTAINER_pn-ghostscript = "Hongxu Jia <[email protected]>"
 RECIPE_MAINTAINER_pn-git = "Robert Yang <[email protected]>"
 RECIPE_MAINTAINER_pn-glew = "Saul Wold <[email protected]>"
 RECIPE_MAINTAINER_pn-glib-2.0 = "Robert Yang <[email protected]>"

@@ -319,7 +319,7 @@ RECIPE_MAINTAINER_pn-libksba = "Saul Wold <[email protected]>"
 RECIPE_MAINTAINER_pn-libmad = "Saul Wold <[email protected]>"
 RECIPE_MAINTAINER_pn-libmatchbox = "Ross Burton <[email protected]>"
 RECIPE_MAINTAINER_pn-libmpc = "Richard Purdie <[email protected]>"
-RECIPE_MAINTAINER_pn-libnewt = "Kai Kang <[email protected]>"
+RECIPE_MAINTAINER_pn-libnewt = "Hongxu Jia <[email protected]>"
 RECIPE_MAINTAINER_pn-libnfsidmap = "Paul Eggleton <[email protected]>"
 RECIPE_MAINTAINER_pn-libnl = "Saul Wold <[email protected]>"
 RECIPE_MAINTAINER_pn-libnotify = "Ross Burton <[email protected]>"

@@ -568,7 +568,7 @@ RECIPE_MAINTAINER_pn-python-smartpm = "Paul Eggleton <[email protected].
 RECIPE_MAINTAINER_pn-python3 = "Richard Purdie <[email protected]>"
 RECIPE_MAINTAINER_pn-qemu-helper-native = "Cristian Iorga <[email protected]>"
 RECIPE_MAINTAINER_pn-qemu = "Cristian Iorga <[email protected]>"
-RECIPE_MAINTAINER_pn-qmmp = "Kai Kang <[email protected]>"
+RECIPE_MAINTAINER_pn-qmmp = "Hongxu Jia <[email protected]>"
 RECIPE_MAINTAINER_pn-qt4e-demo-image = "Paul Eggleton <[email protected]>"
 RECIPE_MAINTAINER_pn-qt4-embedded = "Paul Eggleton <[email protected]>"
 RECIPE_MAINTAINER_pn-qt4-graphics-system = "Paul Eggleton <[email protected]>"

Signature · 1 line

1.8.1.2