Skip to contentSkip to conversation

package/gerbera: fix build with latest exiv2

PATCH New Nicolas Serafini 2 participants 3 messages May 1, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/gerbera: fix build with latest exiv2

After the bump to exiv2 0.27.1 a build error due to missing header inclusion apparead.

This patch fixes
http://autobuild.buildroot.net/results/3831acf7f4c5a9f1a404e0ced3d6bec7a2249601/
http://autobuild.buildroot.net/results/de0545462c6017fe54acc284b914b9fa8b0172d8/

The patch is waiting merge into the mainline
https://github.com/gerbera/gerbera/pull/457

---
 package/gerbera/gerbera.hash | 1 +
 package/gerbera/gerbera.mk   | 3 +++
 2 files changed, 4 insertions(+)
package/gerbera/gerbera.hash +1 -0
index aa6a29f81e..9f19e6ffc8 100644
@@ -1,3 +1,4 @@
 # Locally computed:
 sha256	9c4509189eab6bff0fe183e1dd54ea8cb17d7fb0bc6e21bb5b1a8ccaaf6c60d9	gerbera-v1.3.1.tar.gz
 sha256	cae4138373be41fd2be75faf41ce7efbcf49fb17d0e05ad1c51cc01ac335b9b6	LICENSE.md
+sha256	7fe27cab2145b1bde2a2a8fadf3a3f684e7a1a6ad6a31cf4bcdc7bc3e649faaa	457.patch
package/gerbera/gerbera.mk +3 -0
index 5b69faaf82..62edbbc900 100644
@@ -19,6 +19,9 @@ GERBERA_CONF_OPTS = \
 	-DWITH_DEBUG=OFF \
 	-DWITH_JS=OFF
 
+GERBERA_PATCH = \
+	https://patch-diff.githubusercontent.com/raw/gerbera/gerbera/pull/457.patch
+
 # Uses __atomic_fetch_add_4
 ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
 GERBERA_CONF_OPTS += -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -latomic"
Signature · 1 line
2.21.0
#1 lore raw

PATCH 1/1 package/gerbera: fix build with latest exiv2

Quoted 4 lines · Nicolas Serafini

After the bump to exiv2 0.27.1 a build error due to missing header inclusion apparead.

This patch fixes

Small nit: write this as:

Fixes:

That way, patchwork recognizes it and marks it as a fix in the patch overview.

Quoted 17 lines

http://autobuild.buildroot.net/results/3831acf7f4c5a9f1a404e0ced3d6bec7a2249601/
http://autobuild.buildroot.net/results/de0545462c6017fe54acc284b914b9fa8b0172d8/

The patch is waiting merge into the mainline
https://github.com/gerbera/gerbera/pull/457

---
 package/gerbera/gerbera.hash | 1 +
 package/gerbera/gerbera.mk   | 3 +++
 2 files changed, 4 insertions(+)
package/gerbera/gerbera.hash +0 -0
index aa6a29f81e..9f19e6ffc8 100644

package/gerbera/gerbera.hash line 4

Quoted 4 lines
package/gerbera/gerbera.hash +1 -0
@@ -1,3 +1,4 @@
 # Locally computed:
 sha256	9c4509189eab6bff0fe183e1dd54ea8cb17d7fb0bc6e21bb5b1a8ccaaf6c60d9	gerbera-v1.3.1.tar.gz
 sha256	cae4138373be41fd2be75faf41ce7efbcf49fb17d0e05ad1c51cc01ac335b9b6	LICENSE.md
+sha256	7fe27cab2145b1bde2a2a8fadf3a3f684e7a1a6ad6a31cf4bcdc7bc3e649faaa	457.patch

Unfortunately, the hashes of patches from git pull requests are not stable,
because of the

index f3a35d48..7f8c89bd 100644

(additional hex digits are added to the abbreviated sha1 when more objects are added to the repo).

So we have to include the patch inside Buildroot rather than downloading it.

I've done this and committed to master, thanks. The content of the commit is
completely different, of course, but the spirit is the same so I've retained your authorship on it.

Regards,
Arnout

Quoted 15 lines
package/gerbera/gerbera.mk +3 -0
index 5b69faaf82..62edbbc900 100644
@@ -19,6 +19,9 @@ GERBERA_CONF_OPTS = \
 	-DWITH_DEBUG=OFF \
 	-DWITH_JS=OFF
 
+GERBERA_PATCH = \
+	https://patch-diff.githubusercontent.com/raw/gerbera/gerbera/pull/457.patch
+
 # Uses __atomic_fetch_add_4
 ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
 GERBERA_CONF_OPTS += -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -latomic"
#2 lore raw

PATCH 1/1 package/gerbera: fix build with latest exiv2

Quoted 48 lines · On Wed, 1 May 2019 15:04:43 +0200 Arnout Vandecappelle <[email protected]> wrote:
Quoted 4 lines · Nicolas Serafini

After the bump to exiv2 0.27.1 a build error due to missing header inclusion apparead.

This patch fixes

Small nit: write this as:

Fixes:

That way, patchwork recognizes it and marks it as a fix in the patch overview.

Quoted 19 lines

http://autobuild.buildroot.net/results/3831acf7f4c5a9f1a404e0ced3d6bec7a2249601/
http://autobuild.buildroot.net/results/de0545462c6017fe54acc284b914b9fa8b0172d8/

The patch is waiting merge into the mainline
https://github.com/gerbera/gerbera/pull/457

---
 package/gerbera/gerbera.hash | 1 +
 package/gerbera/gerbera.mk   | 3 +++
 2 files changed, 4 insertions(+)
(quoted diff) +0 -0

b/package/gerbera/gerbera.hash index aa6a29f81e..9f19e6ffc8 100644

package/gerbera/gerbera.hash +0 -0
@@ -1,3 +1,4 @@
 # Locally computed:
 sha256
Quoted 6 lines

9c4509189eab6bff0fe183e1dd54ea8cb17d7fb0bc6e21bb5b1a8ccaaf6c60d9 gerbera-v1.3.1.tar.gz sha256 cae4138373be41fd2be75faf41ce7efbcf49fb17d0e05ad1c51cc01ac335b9b6 LICENSE.md +sha256 7fe27cab2145b1bde2a2a8fadf3a3f684e7a1a6ad6a31cf4bcdc7bc3e649faaa 457.patch

Unfortunately, the hashes of patches from git pull requests are not stable,
because of the

index f3a35d48..7f8c89bd 100644

(additional hex digits are added to the abbreviated sha1 when more objects are added to the repo).

Quoted 7 lines

So we have to include the patch inside Buildroot rather than downloading it.

I've done this and committed to master, thanks. The content of the commit is
completely different, of course, but the spirit is the same so I've retained your authorship on it.

Great thanks a lot.
I was not aware about the patches on Github, thanks for the explanation.

Nicolas

Quoted 19 lines

Regards,
Arnout

Quoted 15 lines
package/gerbera/gerbera.mk +2 -0
index 5b69faaf82..62edbbc900 100644
@@ -19,6 +19,9 @@ GERBERA_CONF_OPTS = \
 	-DWITH_DEBUG=OFF \
 	-DWITH_JS=OFF
 
+GERBERA_PATCH = \
+

https://eur02.safelinks.protection.outlook.com/?url=https%3A%2F%2Fpatch-diff.githubusercontent.com%2Fraw%2Fgerbera%2Fgerbera%2Fpull%2F457.patch&amp;data=02%7C01%7Cnicolas.serafini%40sensefly.com%7C514760cad1294ff2ba0808d6ce3595e6%7Cff7d991b392248038418ab806a3414a6%7C1%7C1%7C636923126886864768&amp;sdata=IXL561dClwwX3Uk4%2FfypwIctlrHYoyu4XHpc1QUQAtI%3D&amp;reserved=0
+ # Uses __atomic_fetch_add_4
ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
GERBERA_CONF_OPTS += -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -latomic"