Skip to contentSkip to conversation

package/gerbera: bump to version 1.3.1

PATCH New Fabrice Fontaine 2 participants 2 messages Apr 5, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/gerbera: bump to version 1.3.1

Remove all patches (already in version)

---
 ...ix-static-build-with-curl-and-libidn.patch |  41 ----
 ...cmake-FindFFMPEG-cmake-use-pkgconfig.patch | 175 ------------------
 ...FindLibUpnp.cmake-fix-static-linking.patch |  44 -----
 package/gerbera/gerbera.hash                  |   2 +-
 package/gerbera/gerbera.mk                    |   2 +-
 5 files changed, 2 insertions(+), 262 deletions(-)
 delete mode 100644 package/gerbera/0001-CMakeLists.txt-fix-static-build-with-curl-and-libidn.patch
 delete mode 100644 package/gerbera/0002-cmake-FindFFMPEG-cmake-use-pkgconfig.patch
 delete mode 100644 package/gerbera/0003-cmake-FindLibUpnp.cmake-fix-static-linking.patch
package/gerbera/0001-CMakeLists.txt-fix-static-build-with-curl-and-libidn.patch deleted +0 -41
deleted file mode 100644
index 94f742c3f8..0000000000
@@ -1,41 +0,0 @@
-From de0e7fe3b56cff79c11aedc89448814fab8d1877 Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <[email protected]>
-Date: Fri, 8 Mar 2019 19:11:11 +0100
-Subject: [PATCH] MakeLists.txt: fix static build with curl and libidn2
-
-curl can be statically linked with libidn2, in this case, build fails:
-/accts/mlweber1/rclinux/rc-buildroot-test/scripts/instance-0/output/host/m68k-buildroot-linux-uclibc/sysroot/usr/lib/libcurl.a(libcurl_la-url.o): In function `free_idnconverted_hostname.isra.1':
-url.c:(.text+0xf4): undefined reference to `idn2_free'
-
-To fix this issue, add a call to pkg_check_modules to retrieve any
-needed dependencies
-
-Fixes:
- - http://autobuild.buildroot.org/results/be5893b507d22a23951efeea20c18642742cef5a
-
-Signed-off-by: Fabrice Fontaine <[email protected]>
-[Upstream status: https://github.com/gerbera/gerbera/pull/429]
----
- CMakeLists.txt | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d0eed230..e6b62c96 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -443,7 +443,11 @@ if(WITH_MYSQL)
- endif()
- 
- if(WITH_CURL)
--    find_package (CURL REQUIRED)
-+    find_package(PkgConfig QUIET)
-+    pkg_check_modules (CURL QUIET libcurl)
-+    if (NOT CURL_FOUND)
-+        find_package (CURL REQUIRED)
-+    endif()
-     if (CURL_FOUND)
-         include_directories(${CURL_INCLUDE_DIRS})
-         target_link_libraries (gerbera ${CURL_LIBRARIES})
--- 
-2.20.1
-
package/gerbera/0002-cmake-FindFFMPEG-cmake-use-pkgconfig.patch deleted +0 -175

175 lines not on this page · raw message

package/gerbera/0003-cmake-FindLibUpnp.cmake-fix-static-linking.patch deleted +0 -44

44 lines not on this page · raw message

package/gerbera/gerbera.hash +1 -1
index bcac080c9d..5bbd8826b1 100644
@@ -1,3 +1,3 @@
 # Locally computed:
-sha256	5e40971c519eb322fe0111754cafa12d99c47c2ae7d0f9f1aebb19b06e74a912	gerbera-v1.3.0.tar.gz
+sha256	89bbcebcf6beebb50b9453329b13e6a20e3e505dee5655486e90e1f085591f4a	gerbera-v1.3.1.tar.gz
 sha256	cae4138373be41fd2be75faf41ce7efbcf49fb17d0e05ad1c51cc01ac335b9b6	LICENSE.md
package/gerbera/gerbera.mk +1 -1
index 7ded7cec74..5b69faaf82 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-GERBERA_VERSION = v1.3.0
+GERBERA_VERSION = v1.3.1
 GERBERA_SITE = $(call github,gerbera,gerbera,$(GERBERA_VERSION))
 GERBERA_LICENSE = GPL-2.0
 GERBERA_LICENSE_FILES = LICENSE.md
Signature · 1 line
2.20.1