Skip to contentSkip to conversation

package/libshout: move site to https

PATCH New Fabrice Fontaine 2 participants 5 messages Jul 31, 2019 – Aug 20, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 package/libshout: move site to https

Move site from http to https as HTTP URL now returns "301 Moved Permanently"

---
 package/libshout/libshout.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/libshout/libshout.mk +1 -1
index 4f209081a4..375ce05b4b 100644
@@ -5,7 +5,7 @@
 ################################################################################
 
 LIBSHOUT_VERSION = 2.4.1
-LIBSHOUT_SITE = http://downloads.xiph.org/releases/libshout
+LIBSHOUT_SITE = https://downloads.xiph.org/releases/libshout
 LIBSHOUT_LICENSE = LGPL-2.0+
 LIBSHOUT_LICENSE_FILES = COPYING
 LIBSHOUT_INSTALL_STAGING = YES
Signature · 1 line
2.20.1
#1 lore raw

PATCH 2/2 package/libshout: bump to version 2.4.3

- Remove patches (already in version) and so remove AUTORECONF
- Use new option to disable examples
- Add hash for license file

---
 .../0001-Fix-THEORA-SPEEX-_LDFLAGS-typo.patch | 45 --------------
 ...sure-SHOUT_REQUIRES-contains-OpenSSL.patch | 55 -----------------
 ...shout-tls-compile-with-OpenSSL-1.1.0.patch | 59 -------------------
 package/libshout/libshout.hash                |  8 ++-
 package/libshout/libshout.mk                  |  6 +-
 5 files changed, 7 insertions(+), 166 deletions(-)
 delete mode 100644 package/libshout/0001-Fix-THEORA-SPEEX-_LDFLAGS-typo.patch
 delete mode 100644 package/libshout/0002-Make-sure-SHOUT_REQUIRES-contains-OpenSSL.patch
 delete mode 100644 package/libshout/0003-libshout-tls-compile-with-OpenSSL-1.1.0.patch
package/libshout/0001-Fix-THEORA-SPEEX-_LDFLAGS-typo.patch deleted +0 -45
deleted file mode 100644
index 4d173c51e9..0000000000
@@ -1,45 +0,0 @@
-From d96a3cafeebeb80b4796bacbe0e6da0bbd3ee48e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=C3=B6rg=20Krause?= <[email protected]>
-Date: Sun, 28 Aug 2016 00:39:55 +0200
-Subject: [PATCH 1/2] Fix {THEORA,SPEEX}_LDFLAGS typo
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Needed to properly link against libshout, otherwise the build fails with:
-
-  error: LDFLAGS: No such file or directory
-
-Upstream status: pending
-https://github.com/xiph/Icecast-libshout/pull/4
-
-Signed-off-by: J?rg Krause <[email protected]>
----
- configure.ac | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 87a7f55..85f18ad 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -134,7 +134,7 @@ PKG_CHECK_MODULES(THEORA, theora, [
-   ])
- fi
- XIPH_VAR_APPEND([XIPH_CPPFLAGS],[$THEORA_CFLAGS])
--XIPH_VAR_PREPEND([XIPH_LIBS],[$THEORA LDFLAGS $THEORA_LIBS])
-+XIPH_VAR_PREPEND([XIPH_LIBS],[$THEORA_LDFLAGS $THEORA_LIBS])
- AM_CONDITIONAL([HAVE_THEORA], [test -n "$THEORA_LIBS"])
- if test -n "$THEORA_LIBS"
- then
-@@ -153,7 +153,7 @@ PKG_CHECK_MODULES(SPEEX, speex, [
-   ])
- fi
- XIPH_VAR_APPEND([XIPH_CPPFLAGS],[$SPEEX_CFLAGS])
--XIPH_VAR_PREPEND([XIPH_LIBS],[$SPEEX LDFLAGS $SPEEX_LIBS])
-+XIPH_VAR_PREPEND([XIPH_LIBS],[$SPEEX_LDFLAGS $SPEEX_LIBS])
- AM_CONDITIONAL([HAVE_SPEEX], [test -n "$SPEEX_LIBS"])
- if test -n "$SPEEX_LIBS"
- then
--- 
-2.9.3
-
package/libshout/0002-Make-sure-SHOUT_REQUIRES-contains-OpenSSL.patch deleted +0 -55

55 lines not on this page · raw message

package/libshout/0003-libshout-tls-compile-with-OpenSSL-1.1.0.patch deleted +0 -59

59 lines not on this page · raw message

package/libshout/libshout.hash +5 -3
index 5b3ae2d446..06702891c0 100644
@@ -1,3 +1,5 @@
-# From https://gitweb.gentoo.org/repo/gentoo.git/tree/media-libs/libshout/Manifest
-# hash from http://downloads.xiph.org/releases/libshout/SHA256SUMS is wrong!
-sha256	f3acb8dec26f2dbf6df778888e0e429a4ce9378a9d461b02a7ccbf2991bbf24d	libshout-2.4.1.tar.gz
+# From https://downloads.xiph.org/releases/libshout/SHA256SUMS
+sha256	0d8af55d1141bf90710bcd41a768c9cc5adb251502a0af1dd22c8da215d40dfe	libshout-2.4.3.tar.gz
+
+# Hash for license file
+sha256	7a4436f9ec37603356791c87de3bc444989befd2682d29efb3d97604e04c1852	COPYING
package/libshout/libshout.mk +2 -4
index 375ce05b4b..6537a1fea3 100644
@@ -4,15 +4,13 @@
 #
 ################################################################################
 
-LIBSHOUT_VERSION = 2.4.1
+LIBSHOUT_VERSION = 2.4.3
 LIBSHOUT_SITE = https://downloads.xiph.org/releases/libshout
 LIBSHOUT_LICENSE = LGPL-2.0+
 LIBSHOUT_LICENSE_FILES = COPYING
 LIBSHOUT_INSTALL_STAGING = YES
 LIBSHOUT_DEPENDENCIES = host-pkgconf libogg libvorbis
-
-# patching configure.ac
-LIBSHOUT_AUTORECONF = YES
+LIBSHOUT_CONF_OPTS = --disable-examples
 
 ifeq ($(BR2_PACKAGE_LIBTHEORA),y)
 LIBSHOUT_CONF_OPTS += --enable-theora
Signature · 1 line
2.20.1
#2 lore raw

PATCH 2/2 package/libshout: bump to version 2.4.3

Quoted 7 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Fabrice" == Fabrice Fontaine <[email protected]> writes:

- Remove patches (already in version) and so remove AUTORECONF
- Use new option to disable examples
- Add hash for license file

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard