Skip to contentSkip to conversation

motion: bump to version 4.1

PATCH New Fabrice Fontaine 2 participants 5 messages Nov 19, 2017 – Nov 23, 2017

lore
Share & tools
lore

Fabrice Fontaine

author
#0 lore raw

PATCH 1/1 motion: bump to version 4.1

- Remove 0001-configure.ac-use-given-CFLAGS-LIBS-for-mysqlclient-l.patch, it does not have been sent upstream but issue has been fixed by
https://github.com/Motion-Project/motion/commit/3b7164f7f9c2b123f850f8cd1bc0a860ca51c0fe#diff-67e997bcfdac55191033d57a16d1408a
- 0002-Rename-base64_encode.patch has been integrated into this version
- --without-jpeg-turbo has been deleted from configure.ac
- libsdl dependency has been removed

Signed-off-by Fabrice Fontaine <[email protected]>
---
 ...c-use-given-CFLAGS-LIBS-for-mysqlclient-l.patch |  31 ------
 package/motion/0002-Rename-base64_encode.patch     | 116 ---------------------
 package/motion/motion.hash                         |   3 +-
 package/motion/motion.mk                           |  22 +---
 4 files changed, 5 insertions(+), 167 deletions(-)
 delete mode 100644 package/motion/0001-configure.ac-use-given-CFLAGS-LIBS-for-mysqlclient-l.patch
 delete mode 100644 package/motion/0002-Rename-base64_encode.patch
package/motion/0001-configure.ac-use-given-CFLAGS-LIBS-for-mysqlclient-l.patch deleted +0 -31
deleted file mode 100644
index 4211fe67b..000000000
@@ -1,31 +0,0 @@
-From 5a1081d36bf2861ffc882354c583a0eb6b0ee3d5 Mon Sep 17 00:00:00 2001
-From: Peter Seiderer <[email protected]>
-Date: Tue, 25 Oct 2016 21:27:41 +0200
-Subject: [PATCH] configure.ac: use given CFLAGS/LIBS for mysqlclient library
- check
-
-Needed for static linking of mysql with enabled libz.
-
-Signed-off-by: Peter Seiderer <[email protected]>
----
- configure.ac | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 5782fd6..aa5d9dd 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -618,8 +618,8 @@ else
- 		#LDFLAGS="-L$MYSQL_LIBDIR"
- 		saved_CFLAGS=$CFLAGS
- 		saved_LIBS=$LIBS
--		CFLAGS="-I$MYSQL_INCDIR"
--		LIBS="-L$MYSQL_LIBDIR"
-+		CFLAGS="-I$MYSQL_INCDIR $CFLAGS"
-+		LIBS="-L$MYSQL_LIBDIR $LIBS"
- 		AC_CHECK_LIB(mysqlclient,mysql_init,[
- 					TEMP_LIBS="$TEMP_LIBS -L$MYSQL_LIBDIR -lmysqlclient -lz"
- 					TEMP_CFLAGS="$TEMP_CFLAGS -I$MYSQL_INCDIR"
--- 
-2.8.1
-
package/motion/0002-Rename-base64_encode.patch deleted +0 -116

116 lines not on this page · raw message

package/motion/motion.hash +2 -1
index e8591179e..40cb66b7e 100644
@@ -1,2 +1,3 @@
 # Locally computed:
-sha256	2f67669a09ce0481ecd987028dae1c5cb135dfdc3c254c06ab7c9ca0c6c183f0	motion-release-4.0.1.tar.gz
+sha256	277029c80df0d37deefbbea6d15c66a9067d9166fe8f76eb5f90aa6e97aa9741	motion-release-4.1.tar.gz
+sha256	91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad	COPYING
package/motion/motion.mk +3 -19
index ce64a9328..dfbb70d64 100644
@@ -4,17 +4,15 @@
 #
 ################################################################################
 
-MOTION_VERSION = release-4.0.1
+MOTION_VERSION = release-4.1
 MOTION_SITE = $(call github,Motion-Project,motion,$(MOTION_VERSION))
 MOTION_LICENSE = GPL-2.0
 MOTION_LICENSE_FILES = COPYING
 MOTION_DEPENDENCIES = host-pkgconf jpeg
-# From git and patched configure.ac
+# From git
 MOTION_AUTORECONF = YES
 
-# motion does not use any specific function of jpeg-turbo, so just relies on
-# jpeg selection
-MOTION_CONF_OPTS += --without-jpeg-turbo --without-optimizecpu
+MOTION_CONF_OPTS += --without-optimizecpu
 
 ifeq ($(BR2_PACKAGE_FFMPEG_SWSCALE),y)
 MOTION_DEPENDENCIES += ffmpeg

@@ -29,10 +27,6 @@ MOTION_CONF_OPTS += \
 	--with-mysql \
 	--with-mysql-include=$(STAGING_DIR)/usr/include/mysql \
 	--with-mysql-lib=$(STAGING_DIR)/usr/lib
-# static link of mysql needs -lz
-ifeq ($(BR2_STATIC_LIBS)$(BR2_PACKAGE_ZLIB),yy)
-MOTION_CONF_ENV += LIBS="-lz"
-endif
 else
 MOTION_CONF_OPTS += --without-mysql
 endif

@@ -47,16 +41,6 @@ else
 MOTION_CONF_OPTS += --without-pgsql
 endif
 
-ifeq ($(BR2_PACKAGE_SDL),y)
-MOTION_DEPENDENCIES += sdl
-MOTION_CONF_OPTS += --with-sdl=$(STAGING_DIR)/usr
-# overwrite ac_cv_path_CONFIG_SDL in case sdl development is
-# installed on the host
-MOTION_CONF_ENV += ac_cv_path_CONFIG_SDL=$(STAGING_DIR)/usr/bin/sdl-config
-else
-MOTION_CONF_OPTS += --without-sdl
-endif
-
 ifeq ($(BR2_PACKAGE_SQLITE),y)
 MOTION_DEPENDENCIES += sqlite
 MOTION_CONF_OPTS += --with-sqlite3
Signature · 1 line
2.14.1
#1 lore raw

PATCH 1/1 motion: bump to version 4.1

Hello,

Quoted 6 lines · Fabrice Fontaine

- Remove 0001-configure.ac-use-given-CFLAGS-LIBS-for-mysqlclient-l.patch, it does not have been sent upstream but issue has been fixed by
https://github.com/Motion-Project/motion/commit/3b7164f7f9c2b123f850f8cd1bc0a860ca51c0fe#diff-67e997bcfdac55191033d57a16d1408a
- 0002-Rename-base64_encode.patch has been integrated into this version
- --without-jpeg-turbo has been deleted from configure.ac
- libsdl dependency has been removed

Thanks for this detailed commit log. However..

package/motion/motion.mk MOTION_CONF_OPTS += \ · line 35

Quoted 10 lines

ifeq ($(BR2_PACKAGE_FFMPEG_SWSCALE),y)
MOTION_DEPENDENCIES += ffmpeg

package/motion/motion.mk +0 -4
@@ -29,10 +27,6 @@ MOTION_CONF_OPTS += \
 	--with-mysql \
 	--with-mysql-include=$(STAGING_DIR)/usr/include/mysql \
 	--with-mysql-lib=$(STAGING_DIR)/usr/lib
-# static link of mysql needs -lz
-ifeq ($(BR2_STATIC_LIBS)$(BR2_PACKAGE_ZLIB),yy)
-MOTION_CONF_ENV += LIBS="-lz"
-endif

... this particular change isn't described. Is it done intentionally?

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
author
#2 lore raw

PATCH 1/1 motion: bump to version 4.1

Dear Thomas,

2017-11-20 8:45 GMT+01:00 Thomas Petazzoni <
[email protected]>:

Quoted 15 lines

Hello,

Quoted 1 line · Fabrice Fontaine

- Remove 0001-configure.ac-use-given-CFLAGS-LIBS-for-mysqlclient-l.

patch,

Quoted 2 lines

it does not have been sent upstream but issue has been fixed by
https://github.com/Motion-Project/motion/commit/

3b7164f7f9c2b123f850f8cd1bc0a860ca51c0fe#diff-
67e997bcfdac55191033d57a16d1408a

Quoted 3 lines

- 0002-Rename-base64_encode.patch has been integrated into this version
- --without-jpeg-turbo has been deleted from configure.ac
- libsdl dependency has been removed

Thanks for this detailed commit log. However..

Quoted 13 lines

package/motion/motion.mk MOTION_CONF_OPTS += \ · line 35

Quoted 10 lines

ifeq ($(BR2_PACKAGE_FFMPEG_SWSCALE),y)
MOTION_DEPENDENCIES += ffmpeg

package/motion/motion.mk +0 -4
@@ -29,10 +27,6 @@ MOTION_CONF_OPTS += \
      --with-mysql \
      --with-mysql-include=$(STAGING_DIR)/usr/include/mysql \
      --with-mysql-lib=$(STAGING_DIR)/usr/lib
-# static link of mysql needs -lz
-ifeq ($(BR2_STATIC_LIBS)$(BR2_PACKAGE_ZLIB),yy)
-MOTION_CONF_ENV += LIBS="-lz"
-endif

... this particular change isn't described. Is it done intentionally?

This part was linked to 0001-configure.ac-use-given- CFLAGS-LIBS-for-mysqlclient-l.patch (see
https://git.buildroot.net/buildroot/commit/package/motion?id=b83107e53ceace4f6d95520a193545bec729cae6
).

Quoted 9 lines

Thanks!

Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

Best Regards,

Fabrice
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20171120/f63b9832/attachment.html>

Applied
#3 lore raw

PATCH 1/1 motion: bump to version 4.1

In reply to Fabrice Fontaine

Hello,

Quoted 8 lines · Fabrice Fontaine

- Remove 0001-configure.ac-use-given-CFLAGS-LIBS-for-mysqlclient-l.patch, it does not have been sent upstream but issue has been fixed by
https://github.com/Motion-Project/motion/commit/3b7164f7f9c2b123f850f8cd1bc0a860ca51c0fe#diff-67e997bcfdac55191033d57a16d1408a
- 0002-Rename-base64_encode.patch has been integrated into this version
- --without-jpeg-turbo has been deleted from configure.ac
- libsdl dependency has been removed

Signed-off-by Fabrice Fontaine <[email protected]>
Quoted 8 lines
---
 ...c-use-given-CFLAGS-LIBS-for-mysqlclient-l.patch |  31 ------
 package/motion/0002-Rename-base64_encode.patch     | 116 ---------------------
 package/motion/motion.hash                         |   3 +-
 package/motion/motion.mk                           |  22 +---
 4 files changed, 5 insertions(+), 167 deletions(-)
 delete mode 100644 package/motion/0001-configure.ac-use-given-CFLAGS-LIBS-for-mysqlclient-l.patch
 delete mode 100644 package/motion/0002-Rename-base64_encode.patch

Applied to next, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#4 lore raw

PATCH 1/1 motion: bump to version 4.1

In reply to Fabrice Fontaine

Hello,

Quoted 8 lines · Fabrice Fontaine

- Remove 0001-configure.ac-use-given-CFLAGS-LIBS-for-mysqlclient-l.patch, it does not have been sent upstream but issue has been fixed by
https://github.com/Motion-Project/motion/commit/3b7164f7f9c2b123f850f8cd1bc0a860ca51c0fe#diff-67e997bcfdac55191033d57a16d1408a
- 0002-Rename-base64_encode.patch has been integrated into this version
- --without-jpeg-turbo has been deleted from configure.ac
- libsdl dependency has been removed

Signed-off-by Fabrice Fontaine <[email protected]>

This already caused a build failure:

http://autobuild.buildroot.net/results/655/65534775c5977e2424c5f5c63c46f9d0f39d7e1b/build-end.log

Best regards,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com