* [Buildroot] [PATCH 1/2] opencv: Bump version to 2.4.10
@ 2014-10-01 12:18 Vicente Olivert Riera
2014-10-01 12:18 ` [Buildroot] [PATCH 2/2] opencv: Let opencv's build system handle the ts module dependencies Vicente Olivert Riera
` (2 more replies)
0 siblings, 3 replies; 8+ messages in thread
From: Vicente Olivert Riera @ 2014-10-01 12:18 UTC (permalink / raw)
To: buildroot
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
---
package/opencv/opencv.hash | 6 +++---
package/opencv/opencv.mk | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/package/opencv/opencv.hash b/package/opencv/opencv.hash
index 04cb3c5..fc3b750 100644
--- a/package/opencv/opencv.hash
+++ b/package/opencv/opencv.hash
@@ -1,3 +1,3 @@
-# From https://github.com/itseez/opencv/archive/2.4.9.1/
-md5 f9d8626711a183a8f39ce9822a40f35f opencv-2.4.9.1.tar.gz
-sha1 adcaf808e4d5d3b394514061d1da3d4352964c7d opencv-2.4.9.1.tar.gz
+# From https://github.com/itseez/opencv/archive/2.4.10/
+md5 3346a59310d788d3845f4fd6043a108a opencv-2.4.10.tar.gz
+sha1 a0c2d5944364fc4f26b6160b33c03082b1fa08c1 opencv-2.4.10.tar.gz
diff --git a/package/opencv/opencv.mk b/package/opencv/opencv.mk
index 628624a..5d3993b 100644
--- a/package/opencv/opencv.mk
+++ b/package/opencv/opencv.mk
@@ -4,7 +4,7 @@
#
################################################################################
-OPENCV_VERSION = 2.4.9.1
+OPENCV_VERSION = 2.4.10
OPENCV_SITE = $(call github,itseez,opencv,$(OPENCV_VERSION))
OPENCV_INSTALL_STAGING = YES
OPENCV_LICENSE = BSD-3c
--
1.7.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* [Buildroot] [PATCH 2/2] opencv: Let opencv's build system handle the ts module dependencies
2014-10-01 12:18 [Buildroot] [PATCH 1/2] opencv: Bump version to 2.4.10 Vicente Olivert Riera
@ 2014-10-01 12:18 ` Vicente Olivert Riera
2014-10-01 20:05 ` Samuel Martin
2014-10-02 18:58 ` Peter Korsgaard
2014-10-01 19:50 ` [Buildroot] [PATCH 1/2] opencv: Bump version to 2.4.10 Samuel Martin
2014-10-02 18:58 ` Peter Korsgaard
2 siblings, 2 replies; 8+ messages in thread
From: Vicente Olivert Riera @ 2014-10-01 12:18 UTC (permalink / raw)
To: buildroot
In the former version of opencv we added a patch to fix a dependencies
problem in the ts module. That issue was reported upstream and is now
merged in the 2.4.10 version:
https://github.com/Itseez/opencv/commit/7018f9495920f974258502b9b8b26af16d7ee427
So now we can revert our former patch and let opencv's build system
handle the ts module dependencies as we already do in the other modules.
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
---
package/opencv/Config.in | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/package/opencv/Config.in b/package/opencv/Config.in
index d648e5e..24f540e 100644
--- a/package/opencv/Config.in
+++ b/package/opencv/Config.in
@@ -101,7 +101,6 @@ config BR2_PACKAGE_OPENCV_LIB_SUPERRES
config BR2_PACKAGE_OPENCV_LIB_TS
bool "ts (touchscreen)"
- select BR2_PACKAGE_OPENCV_LIB_HIGHGUI
default y
help
Include opencv_ts module into the OpenCV build.
--
1.7.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH 2/2] opencv: Let opencv's build system handle the ts module dependencies
2014-10-01 12:18 ` [Buildroot] [PATCH 2/2] opencv: Let opencv's build system handle the ts module dependencies Vicente Olivert Riera
@ 2014-10-01 20:05 ` Samuel Martin
2014-10-02 8:41 ` Vicente Olivert Riera
2014-10-02 18:59 ` Peter Korsgaard
2014-10-02 18:58 ` Peter Korsgaard
1 sibling, 2 replies; 8+ messages in thread
From: Samuel Martin @ 2014-10-01 20:05 UTC (permalink / raw)
To: buildroot
Hi Vincente, all,
On Wed, Oct 1, 2014 at 2:18 PM, Vicente Olivert Riera
<Vincent.Riera@imgtec.com> wrote:
> In the former version of opencv we added a patch to fix a dependencies
> problem in the ts module. That issue was reported upstream and is now
> merged in the 2.4.10 version:
>
> https://github.com/Itseez/opencv/commit/7018f9495920f974258502b9b8b26af16d7ee427
>
> So now we can revert our former patch and let opencv's build system
> handle the ts module dependencies as we already do in the other modules.
>
> Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
> ---
> package/opencv/Config.in | 1 -
> 1 files changed, 0 insertions(+), 1 deletions(-)
>
> diff --git a/package/opencv/Config.in b/package/opencv/Config.in
> index d648e5e..24f540e 100644
> --- a/package/opencv/Config.in
> +++ b/package/opencv/Config.in
> @@ -101,7 +101,6 @@ config BR2_PACKAGE_OPENCV_LIB_SUPERRES
>
> config BR2_PACKAGE_OPENCV_LIB_TS
> bool "ts (touchscreen)"
> - select BR2_PACKAGE_OPENCV_LIB_HIGHGUI
> default y
> help
> Include opencv_ts module into the OpenCV build.
Thought I understand that you want to keep this knob similar to the
others, it is in contradiction with some pending patch [1] which fix
the inter OpenCV modules dependencies.
Whatever this patch got merged or not, the patch [1] will need to be
updated after the bump to OpenCV-2.4.10 is merged.
So, I have no strong opinion about this patch:
- applying it won't break the autobuilders;
- whereas not applying it only does not improve that much the
situation wrt the issue that [1] attemps to fix.
Regards,
[1] http://patchwork.ozlabs.org/patch/384577/
--
Samuel
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH 2/2] opencv: Let opencv's build system handle the ts module dependencies
2014-10-01 20:05 ` Samuel Martin
@ 2014-10-02 8:41 ` Vicente Olivert Riera
2014-10-02 18:59 ` Peter Korsgaard
1 sibling, 0 replies; 8+ messages in thread
From: Vicente Olivert Riera @ 2014-10-02 8:41 UTC (permalink / raw)
To: buildroot
Dear Samuel Martin,
On 10/01/2014 09:05 PM, Samuel Martin wrote:
> Hi Vincente, all,
>
> On Wed, Oct 1, 2014 at 2:18 PM, Vicente Olivert Riera
> <Vincent.Riera@imgtec.com> wrote:
>> In the former version of opencv we added a patch to fix a dependencies
>> problem in the ts module. That issue was reported upstream and is now
>> merged in the 2.4.10 version:
>>
>> https://github.com/Itseez/opencv/commit/7018f9495920f974258502b9b8b26af16d7ee427
>>
>> So now we can revert our former patch and let opencv's build system
>> handle the ts module dependencies as we already do in the other modules.
>>
>> Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
>> ---
>> package/opencv/Config.in | 1 -
>> 1 files changed, 0 insertions(+), 1 deletions(-)
>>
>> diff --git a/package/opencv/Config.in b/package/opencv/Config.in
>> index d648e5e..24f540e 100644
>> --- a/package/opencv/Config.in
>> +++ b/package/opencv/Config.in
>> @@ -101,7 +101,6 @@ config BR2_PACKAGE_OPENCV_LIB_SUPERRES
>>
>> config BR2_PACKAGE_OPENCV_LIB_TS
>> bool "ts (touchscreen)"
>> - select BR2_PACKAGE_OPENCV_LIB_HIGHGUI
>> default y
>> help
>> Include opencv_ts module into the OpenCV build.
>
> Thought I understand that you want to keep this knob similar to the
> others, it is in contradiction with some pending patch [1] which fix
> the inter OpenCV modules dependencies.
>
> Whatever this patch got merged or not, the patch [1] will need to be
> updated after the bump to OpenCV-2.4.10 is merged.
> So, I have no strong opinion about this patch:
> - applying it won't break the autobuilders;
> - whereas not applying it only does not improve that much the
> situation wrt the issue that [1] attemps to fix.
>
>
> Regards,
>
>
> [1] http://patchwork.ozlabs.org/patch/384577/
I like that patch!!! In fact, I was thinking on doing that, but you
already done it. Great.
Yeah, my purpose with the second patch is to leave thinks as they were
before and consistent with the other opencv modules. I added a highghi
dependency for the ts module, then reported that issue upstream.
Upstream fixed the problem, and now I want to bump the version and
revert the former fix. That's it.
I don't mind if the second patch gets applied or not. But I would really
like to see your patch applied (or a similar patch to take into account
the opencv modules dependencies in Buildroot).
Thanks for your job!
--
Vincent
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH 2/2] opencv: Let opencv's build system handle the ts module dependencies
2014-10-01 20:05 ` Samuel Martin
2014-10-02 8:41 ` Vicente Olivert Riera
@ 2014-10-02 18:59 ` Peter Korsgaard
1 sibling, 0 replies; 8+ messages in thread
From: Peter Korsgaard @ 2014-10-02 18:59 UTC (permalink / raw)
To: buildroot
>>>>> "Samuel" == Samuel Martin <s.martin49@gmail.com> writes:
Hi,
> Thought I understand that you want to keep this knob similar to the
> others, it is in contradiction with some pending patch [1] which fix
> the inter OpenCV modules dependencies.
> Whatever this patch got merged or not, the patch [1] will need to be
> updated after the bump to OpenCV-2.4.10 is merged.
> So, I have no strong opinion about this patch:
> - applying it won't break the autobuilders;
> - whereas not applying it only does not improve that much the
> situation wrt the issue that [1] attemps to fix.
I've applied these two. Samuel, care to rebase and resend your patch?
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH 2/2] opencv: Let opencv's build system handle the ts module dependencies
2014-10-01 12:18 ` [Buildroot] [PATCH 2/2] opencv: Let opencv's build system handle the ts module dependencies Vicente Olivert Riera
2014-10-01 20:05 ` Samuel Martin
@ 2014-10-02 18:58 ` Peter Korsgaard
1 sibling, 0 replies; 8+ messages in thread
From: Peter Korsgaard @ 2014-10-02 18:58 UTC (permalink / raw)
To: buildroot
>>>>> "Vicente" == Vicente Olivert Riera <Vincent.Riera@imgtec.com> writes:
> In the former version of opencv we added a patch to fix a dependencies
> problem in the ts module. That issue was reported upstream and is now
> merged in the 2.4.10 version:
> https://github.com/Itseez/opencv/commit/7018f9495920f974258502b9b8b26af16d7ee427
> So now we can revert our former patch and let opencv's build system
> handle the ts module dependencies as we already do in the other modules.
> Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH 1/2] opencv: Bump version to 2.4.10
2014-10-01 12:18 [Buildroot] [PATCH 1/2] opencv: Bump version to 2.4.10 Vicente Olivert Riera
2014-10-01 12:18 ` [Buildroot] [PATCH 2/2] opencv: Let opencv's build system handle the ts module dependencies Vicente Olivert Riera
@ 2014-10-01 19:50 ` Samuel Martin
2014-10-02 18:58 ` Peter Korsgaard
2 siblings, 0 replies; 8+ messages in thread
From: Samuel Martin @ 2014-10-01 19:50 UTC (permalink / raw)
To: buildroot
On Wed, Oct 1, 2014 at 2:18 PM, Vicente Olivert Riera
<Vincent.Riera@imgtec.com> wrote:
> Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
> ---
> package/opencv/opencv.hash | 6 +++---
> package/opencv/opencv.mk | 2 +-
> 2 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/package/opencv/opencv.hash b/package/opencv/opencv.hash
> index 04cb3c5..fc3b750 100644
> --- a/package/opencv/opencv.hash
> +++ b/package/opencv/opencv.hash
> @@ -1,3 +1,3 @@
> -# From https://github.com/itseez/opencv/archive/2.4.9.1/
> -md5 f9d8626711a183a8f39ce9822a40f35f opencv-2.4.9.1.tar.gz
> -sha1 adcaf808e4d5d3b394514061d1da3d4352964c7d opencv-2.4.9.1.tar.gz
> +# From https://github.com/itseez/opencv/archive/2.4.10/
> +md5 3346a59310d788d3845f4fd6043a108a opencv-2.4.10.tar.gz
> +sha1 a0c2d5944364fc4f26b6160b33c03082b1fa08c1 opencv-2.4.10.tar.gz
> diff --git a/package/opencv/opencv.mk b/package/opencv/opencv.mk
> index 628624a..5d3993b 100644
> --- a/package/opencv/opencv.mk
> +++ b/package/opencv/opencv.mk
> @@ -4,7 +4,7 @@
> #
> ################################################################################
>
> -OPENCV_VERSION = 2.4.9.1
> +OPENCV_VERSION = 2.4.10
> OPENCV_SITE = $(call github,itseez,opencv,$(OPENCV_VERSION))
> OPENCV_INSTALL_STAGING = YES
> OPENCV_LICENSE = BSD-3c
> --
> 1.7.1
Reviewed-by: Samuel Martin <s.martin49@gmail.com>
--
Samuel
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH 1/2] opencv: Bump version to 2.4.10
2014-10-01 12:18 [Buildroot] [PATCH 1/2] opencv: Bump version to 2.4.10 Vicente Olivert Riera
2014-10-01 12:18 ` [Buildroot] [PATCH 2/2] opencv: Let opencv's build system handle the ts module dependencies Vicente Olivert Riera
2014-10-01 19:50 ` [Buildroot] [PATCH 1/2] opencv: Bump version to 2.4.10 Samuel Martin
@ 2014-10-02 18:58 ` Peter Korsgaard
2 siblings, 0 replies; 8+ messages in thread
From: Peter Korsgaard @ 2014-10-02 18:58 UTC (permalink / raw)
To: buildroot
>>>>> "Vicente" == Vicente Olivert Riera <Vincent.Riera@imgtec.com> writes:
> Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2014-10-02 18:59 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-10-01 12:18 [Buildroot] [PATCH 1/2] opencv: Bump version to 2.4.10 Vicente Olivert Riera
2014-10-01 12:18 ` [Buildroot] [PATCH 2/2] opencv: Let opencv's build system handle the ts module dependencies Vicente Olivert Riera
2014-10-01 20:05 ` Samuel Martin
2014-10-02 8:41 ` Vicente Olivert Riera
2014-10-02 18:59 ` Peter Korsgaard
2014-10-02 18:58 ` Peter Korsgaard
2014-10-01 19:50 ` [Buildroot] [PATCH 1/2] opencv: Bump version to 2.4.10 Samuel Martin
2014-10-02 18:58 ` Peter Korsgaard
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.