Skip to contentSkip to conversation

qextserialport : fix download and bump version

PATCH New Sagaert Johan 4 participants 7 messages Nov 7, 2012 – Nov 8, 2012

lore
Share & tools
lore

Sagaert Johan

author
#0 lore raw

PATCH 1/1 qextserialport : fix download and bump version

Signed-off-by Sagaert Johan <[email protected]>
---
 package/qextserialport/qextserialport-no-examples.patch | 17 -----------------
 package/qextserialport/qextserialport.mk                | 12 +++++++-----
 2 files changed, 7 insertions(+), 22 deletions(-)
 delete mode 100644 package/qextserialport/qextserialport-no-examples.patch
package/qextserialport/qextserialport-no-examples.patch deleted +0 -17
deleted file mode 100644
index c7d2d41..0000000
@@ -1,17 +0,0 @@
-Disable compilation of examples
-
-Signed-off-by: Thomas Petazzoni <[email protected]>
-
-Index: qextserialport-ef4af2a2ee3f/qextserialport.pro
-===================================================================
---- qextserialport-ef4af2a2ee3f.orig/qextserialport.pro
-+++ qextserialport-ef4af2a2ee3f/qextserialport.pro
-@@ -1,7 +1,4 @@
- #
- TEMPLATE = subdirs
- CONFIG   += ordered
--SUBDIRS  = src \
--           examples/enumerator \
--           examples/event
--
-+SUBDIRS  = src
package/qextserialport/qextserialport.mk +7 -5
index 6ffb9eb..f240cda 100644
@@ -4,9 +4,11 @@
 #
 #############################################################
 
-QEXTSERIALPORT_VERSION     = ef4af2a2ee3f
-QEXTSERIALPORT_SITE        = https://qextserialport.googlecode.com/hg/
-QEXTSERIALPORT_SITE_METHOD = hg
+QEXTSERIALPORT_VERSION     = f83b4e7ca922e53
+QEXTSERIALPORT_SITE        = https://qextserialport.googlecode.com/git/
+QEXTSERIALPORT_SITE_METHOD = git
+
+QEXTSERIALPORT_LICENSE = MIT
 
 QEXTSERIALPORT_DEPENDENCIES = qt
 

@@ -24,12 +26,12 @@ define QEXTSERIALPORT_INSTALL_STAGING_CMDS
 	mkdir -p $(STAGING_DIR)/usr/include/QExtSerialPort
 	cp $(@D)/src/*.h $(STAGING_DIR)/usr/include/QExtSerialPort/
 	cp $(@D)/src/QExtSerialPort $(STAGING_DIR)/usr/include/QExtSerialPort/
-	cp -a $(@D)/src/build/*.so* $(STAGING_DIR)/usr/lib/
+	cp -a $(@D)/*.so* $(STAGING_DIR)/usr/lib/
 	cp $(@D)/qextserialport.pc $(STAGING_DIR)/usr/lib/pkgconfig/
 endef
 
 define QEXTSERIALPORT_INSTALL_TARGET_CMDS
-	cp -a $(@D)/src/build/*.so.* $(TARGET_DIR)/usr/lib
+	cp -a $(@D)/*.so.* $(TARGET_DIR)/usr/lib
 endef
 
 $(eval $(generic-package))
Signature · 1 line
1.8.0
#1 lore raw

PATCH 1/1 qextserialport : fix download and bump version

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Sagaert" == Sagaert Johan <[email protected]> writes:

Sagaert> Signed-off-by: Sagaert Johan <[email protected]>

Thanks, but it still doesn't build with a base Qt config here as it tries to link with QtGui / QtNetwork, which imho doesn't make much sense for a serial lib.

Now, I know next to nothing about qmake, but it is probably related to the windows version using QtGui.

Thomas, can you take a look at it?

Signature · 1 line
Bye, Peter Korsgaard
author
#2 lore raw

PATCH 1/1 qextserialport : fix download and bump version

Hi

I enabled it because my customer will write his GUI software in QT, so I decided I would include it in the build. I have no clue how to use it, but I think it encapsulates serial comm. The QT way with cross platform qt api's.

I did not try to build that package for my linux host.

Regards Johan

-----Oorspronkelijk bericht-----
Van: Peter Korsgaard [mailto:jacmet at gmail.com] Namens Peter Korsgaard
Verzonden: woensdag 7 november 2012 23:33
Aan: Sagaert Johan; thomas.petazzoni at free-electrons.com
CC: buildroot at busybox.net
Onderwerp: Re: [PATCH 1/1] qextserialport : fix download and bump version

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Sagaert" == Sagaert Johan <[email protected]> writes:

Sagaert> Signed-off-by: Sagaert Johan <[email protected]>

Thanks, but it still doesn't build with a base Qt config here as it tries to link with QtGui / QtNetwork, which imho doesn't make much sense for a serial lib.

Now, I know next to nothing about qmake, but it is probably related to the windows version using QtGui.

Thomas, can you take a look at it?

--
Bye, Peter Korsgaard

#3 lore raw

PATCH 1/1 qextserialport : fix download and bump version

In reply to Peter Korsgaard
Quoted 4 lines · Peter Korsgaard
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Sagaert" == Sagaert Johan <[email protected]> writes:

Sagaert> Signed-off-by: Sagaert Johan <[email protected]>

Quoted 8 lines

Thanks, but it still doesn't build with a base Qt config here as it tries to link with QtGui / QtNetwork, which imho doesn't make much sense for a serial lib.

Now, I know next to nothing about qmake, but it is probably related to the windows version using QtGui.

Thomas, can you take a look at it?

I'll have a look, but I can't say when. I'll most likely be very busy over the next 3 weeks or so.

Best regards,

Thomas

Signature · 4 lines
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
#4 lore raw

PATCH 1/1 qextserialport : fix download and bump version

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Hi,

Sagaert> Signed-off-by: Sagaert Johan <[email protected]>

Quoted 9 lines
Quoted 9 lines

Thanks, but it still doesn't build with a base Qt config here as it tries to link with QtGui / QtNetwork, which imho doesn't make much sense for a serial lib.

Now, I know next to nothing about qmake, but it is probably related to the windows version using QtGui.

Thomas, can you take a look at it?

Thomas> I'll have a look, but I can't say when. I'll most likely be Thomas> very busy over the next 3 weeks or so.

Ok, then I'll commit Johan's patch. It's not 100% correct, but it's atleast better than what we have now (where download even doesn't work).

Signature · 1 line
Bye, Peter Korsgaard
#5 lore raw

PATCH 1/1 qextserialport : fix download and bump version

In reply to Peter Korsgaard
Quoted 9 lines · Peter Korsgaard
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines

"Sagaert" == Sagaert Johan <[email protected]> writes:

Sagaert> Signed-off-by: Sagaert Johan <[email protected]>

Thanks, but it still doesn't build with a base Qt config here as it tries to link with QtGui / QtNetwork, which imho doesn't make much sense for a serial lib.

It's quite likely one of the examples being built.
The changeset removes a patch that removes the examples, but you don't actually have to do that, you can build from within src and the .pro in there will most likely have a line with QT -= gui, just like the QtSerialPort package I sent a while back.

The toplevel .pro file tells qmake that those listed folders should be built and each contain a .pro file inside that matches the folder name. It will simply iterate thru them and call qmake over them. Those "subprojects" contain the actual description of how to build the project, which qmake reads.

#6 lore raw

PATCH 1/1 qextserialport : fix download and bump version

Dear Thiago A. Corr?a,

Quoted 1 line · Thiago A. Corr?a

It's quite likely one of the examples being built.

Indeed. The examples patch removal was here for a reason: it shouldn't have been removed. Some of the examples requires the GUI, and I didn't bother making the examples conditional on whether the GUI was available or not. This example patch should be re-added in one form or another.

Best regards,

Thomas

Signature · 4 lines
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com