From 3173e7e227d12683705e47e7a3b25dccfebe6c0d Mon Sep 17 00:00:00 2001 From: André Draszik Date: Thu, 3 Nov 2016 21:01:19 +0000 Subject: streamripper: add v1.64.6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: André Draszik Signed-off-by: Martin Jansa --- ...build-these-are-foreign-automake-projects.patch | 49 ++++++++++++++++++++++ ...ld-don-t-ignore-CPPFLAGS-from-environment.patch | 30 +++++++++++++ .../0003-ripstream-fix-compilation.patch | 42 +++++++++++++++++++ .../streamripper/streamripper_1.64.6.bb | 29 +++++++++++++ 4 files changed, 150 insertions(+) create mode 100644 meta-multimedia/recipes-multimedia/streamripper/streamripper/0001-build-these-are-foreign-automake-projects.patch create mode 100644 meta-multimedia/recipes-multimedia/streamripper/streamripper/0002-build-don-t-ignore-CPPFLAGS-from-environment.patch create mode 100644 meta-multimedia/recipes-multimedia/streamripper/streamripper/0003-ripstream-fix-compilation.patch create mode 100644 meta-multimedia/recipes-multimedia/streamripper/streamripper_1.64.6.bb (limited to 'meta-multimedia/recipes-multimedia') diff --git a/meta-multimedia/recipes-multimedia/streamripper/streamripper/0001-build-these-are-foreign-automake-projects.patch b/meta-multimedia/recipes-multimedia/streamripper/streamripper/0001-build-these-are-foreign-automake-projects.patch new file mode 100644 index 000000000..c0f4692d1 --- /dev/null +++ b/meta-multimedia/recipes-multimedia/streamripper/streamripper/0001-build-these-are-foreign-automake-projects.patch @@ -0,0 +1,49 @@ +From 4c7165b3fbc0e99e7cdd77031e8a001440d0629d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andr=C3=A9=20Draszik?= +Date: Thu, 3 Nov 2016 20:53:21 +0000 +Subject: [PATCH 1/3] build: these are 'foreign' automake projects +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +In order to prevent automake from complaining about missing + +files ChangeLog, AUTHORS, etc., use the 'foreign' automake +option to instruct it so. + +Upstream-Status: Inappropriate [no upstream activity for 7+ years] +Signed-off-by: André Draszik +--- + configure.ac | 2 +- + libmad-0.15.1b/configure.ac | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index b12d11f..96300d6 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -11,7 +11,7 @@ dnl AC_CHECK_FUNC: defines a shell variable + + AC_PREREQ(2.59) + AC_INIT(streamripper,1.64.6) +-AM_INIT_AUTOMAKE ++AM_INIT_AUTOMAKE([foreign]) + + AC_CONFIG_HEADERS([lib/config.h]) + +diff --git a/libmad-0.15.1b/configure.ac b/libmad-0.15.1b/configure.ac +index 8fb35ee..ab116a6 100644 +--- a/libmad-0.15.1b/configure.ac ++++ b/libmad-0.15.1b/configure.ac +@@ -26,7 +26,7 @@ AC_PREREQ(2.53) + + AC_CONFIG_SRCDIR([decoder.h]) + +-AM_INIT_AUTOMAKE ++AM_INIT_AUTOMAKE([foreign]) + + AM_CONFIG_HEADER([config.h]) + +-- +2.10.1 + diff --git a/meta-multimedia/recipes-multimedia/streamripper/streamripper/0002-build-don-t-ignore-CPPFLAGS-from-environment.patch b/meta-multimedia/recipes-multimedia/streamripper/streamripper/0002-build-don-t-ignore-CPPFLAGS-from-environment.patch new file mode 100644 index 000000000..58473f611 --- /dev/null +++ b/meta-multimedia/recipes-multimedia/streamripper/streamripper/0002-build-don-t-ignore-CPPFLAGS-from-environment.patch @@ -0,0 +1,30 @@ +From 2fcf2b164e25c4b2523dea4b04094916e57ba19e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andr=C3=A9=20Draszik?= +Date: Thu, 3 Nov 2016 20:53:26 +0000 +Subject: [PATCH 2/3] build: don't ignore CPPFLAGS from environment +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Inappropriate [no upstream activity for 7+ years] +Signed-off-by: André Draszik +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 96300d6..1600c88 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -56,7 +56,7 @@ AC_ARG_WITH(curses, + [ --with-curses(=XXX) compile curses front-end (XXX is curses (default), ncurses, ncursesw, pdcurses or slang)]) + + +-CPPFLAGS="-D__UNIX__" ++CPPFLAGS="$CPPFLAGS -D__UNIX__" + AC_SUBST(CPPFLAGS) + + +-- +2.10.1 + diff --git a/meta-multimedia/recipes-multimedia/streamripper/streamripper/0003-ripstream-fix-compilation.patch b/meta-multimedia/recipes-multimedia/streamripper/streamripper/0003-ripstream-fix-compilation.patch new file mode 100644 index 000000000..065254ec8 --- /dev/null +++ b/meta-multimedia/recipes-multimedia/streamripper/streamripper/0003-ripstream-fix-compilation.patch @@ -0,0 +1,42 @@ +From 6d59b60ff5108357ad2c2951a97112e713ee5368 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andr=C3=A9=20Draszik?= +Date: Thu, 3 Nov 2016 20:53:32 +0000 +Subject: [PATCH 3/3] ripstream: fix compilation +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +| ../../streamripper-1.64.6/lib/ripstream.c: In function 'write_id3v2_frame': +| ../../streamripper-1.64.6/lib/ripstream.c:717:5: error: unknown type name '__uint32_t' +| __uint32_t framesize = 0; +| ^~~~~~~~~~ + +The already included srtypes.h does the right thing for all +platforms (I think). It certainly works well here. + +Upstream-Status: Inappropriate [no upstream activity for 7+ years] +Signed-off-by: André Draszik +--- + lib/ripstream.c | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) + +diff --git a/lib/ripstream.c b/lib/ripstream.c +index c671e18..7f311c6 100644 +--- a/lib/ripstream.c ++++ b/lib/ripstream.c +@@ -713,11 +713,7 @@ write_id3v2_frame(RIP_MANAGER_INFO* rmi, char* tag_name, mchar* data, + int rc; + char bigbuf[HEADER_SIZE] = ""; + ID3V2frame id3v2frame; +-#ifndef WIN32 +- __uint32_t framesize = 0; +-#else +- unsigned long int framesize = 0; +-#endif ++ uint32_t framesize = 0; + + memset(&id3v2frame, '\000', sizeof(id3v2frame)); + strncpy(id3v2frame.id, tag_name, 4); +-- +2.10.1 + diff --git a/meta-multimedia/recipes-multimedia/streamripper/streamripper_1.64.6.bb b/meta-multimedia/recipes-multimedia/streamripper/streamripper_1.64.6.bb new file mode 100644 index 000000000..94355b64d --- /dev/null +++ b/meta-multimedia/recipes-multimedia/streamripper/streamripper_1.64.6.bb @@ -0,0 +1,29 @@ +SUMMARY = "download online streams into audio files" +DESCRIPTION = "This command-line tool can be used to record MPEG III \ +and OGG online radio-streams into track-separated audio files." +HOMEPAGE = "http://streamripper.sourceforge.net" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" +DEPENDS = "glib-2.0 libmad libogg libvorbis" + +SRC_URI = "\ + ${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.gz \ + file://0001-build-these-are-foreign-automake-projects.patch \ + file://0002-build-don-t-ignore-CPPFLAGS-from-environment.patch \ + file://0003-ripstream-fix-compilation.patch \ +" +SRC_URI[mdsum] = "a37a1a8b8f9228522196a122a1c2dd32" +SRC_URI[sha256sum] = "c1d75f2e9c7b38fd4695be66eff4533395248132f3cc61f375196403c4d8de42" + +inherit autotools pkgconfig + +EXTRA_OECONF += "--with-included-argv=yes --with-included-libmad=no" +EXTRA_OECONF += "\ + --with-ogg-includes=${STAGING_INCDIR} \ + --with-ogg-libraries=${STAGING_LIBDIR} \ + --with-vorbis-includes=${STAGING_INCDIR} \ + --with-vorbis-libraries=${STAGING_LIBDIR} \ +" + +# the included argv library needs this +CPPFLAGS_append = " -DANSI_PROTOTYPES" -- cgit v1.2.3-54-g00ecf