twolame: Update to 0.4.0

This commit is contained in:
Alexey Pavlov
2019-10-15 11:05:28 +03:00
parent c608e73295
commit 093e06f332
6 changed files with 10 additions and 73 deletions

View File

@@ -9,14 +9,3 @@
# include "../win32/configwin.h"
#else
# include "config.h"
--- twolame-0.3.13/libtwolame/twolame.h.orig 2011-01-01 23:15:01 +0400
+++ twolame-0.3.13/libtwolame/twolame.h 2012-04-13 23:23:34 +0400
@@ -39,7 +39,7 @@
* the library, define LIBTWOLAME_STATIC prior to including this header.
*/
-#ifdef _WIN32
+#ifdef _MSC_VER
#ifdef LIBTWOLAME_STATIC
#define DLL_EXPORT
#else

View File

@@ -1,11 +0,0 @@
--- twolame-0.3.13/libtwolame/Makefile.am.orig 2011-01-21 13:15:32 +0400
+++ twolame-0.3.13/libtwolame/Makefile.am 2012-04-13 23:28:31 +0400
@@ -3,7 +3,7 @@
lib_LTLIBRARIES = libtwolame.la
include_HEADERS = twolame.h
-libtwolame_la_LDFLAGS = -export-dynamic -version-info @TWOLAME_SO_VERSION@
+libtwolame_la_LDFLAGS = -export-dynamic -version-info @TWOLAME_SO_VERSION@ -no-undefined
libtwolame_la_SOURCES = \
ath.c \
ath.h \

View File

@@ -1,20 +0,0 @@
--- twolame-0.3.13/frontend/audioin_raw.c.orig 2012-09-15 11:23:30 +0400
+++ twolame-0.3.13/frontend/audioin_raw.c 2012-09-15 11:28:13 +0400
@@ -25,6 +25,7 @@
#include <stdlib.h>
#include <string.h>
#include <errno.h>
+#include <fcntl.h>
#include "frontend.h"
@@ -94,6 +94,9 @@
if (strcmp(filename, "-") == 0) {
// Use STDIN
audioin->file = stdin;
+#if defined(_WIN32)
+ setmode (fileno (stdin), O_BINARY);
+#endif
} else {
audioin->file = fopen(filename, "rb");
}

View File

@@ -1,12 +0,0 @@
--- twolame-0.3.13/libtwolame/twolame.h.orig 2013-04-04 21:22:42 +0400
+++ twolame-0.3.13/libtwolame/twolame.h 2013-04-04 21:35:50 +0400
@@ -50,8 +50,9 @@
#endif
#endif
#else
+#undef DLL_EXPORT
#define DLL_EXPORT
#endif
#ifndef TRUE

View File

@@ -1,11 +1,11 @@
--- twolame-0.3.13/configure.ac.orig 2013-04-04 21:40:31 +0400
+++ twolame-0.3.13/configure.ac 2013-04-04 21:41:41 +0400
@@ -9,7 +9,7 @@
--- twolame-0.4.0/configure.ac.orig 2019-10-15 21:40:31 +0400
+++ twolame-0.4.0/configure.ac 2019-10-15 21:41:41 +0400
@@ -14,7 +14,7 @@
AC_CONFIG_SRCDIR(libtwolame/twolame.h)
AC_CONFIG_AUX_DIR(build-scripts)
AC_CONFIG_MACRO_DIR(build-scripts)
-AM_INIT_AUTOMAKE([1.10])
+AM_INIT_AUTOMAKE([silent-rules])
LT_PREREQ([2.2])
LT_INIT
AM_MAINTAINER_MODE

View File

@@ -3,8 +3,8 @@
_realname=twolame
pkgbase=mingw-w64-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=0.3.13
pkgrel=3
pkgver=0.4.0
pkgrel=1
pkgdesc="An optimized MPEG Audio Layer 2 (MP2) encoder (mingw-w64)"
arch=('any')
license=('LGPL')
@@ -15,23 +15,14 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-gcc"
depends=("${MINGW_PACKAGE_PREFIX}-libsndfile")
source=("https://downloads.sourceforge.net/${_realname}/${_realname}-${pkgver}.tar.gz"
0001-mingw32-does-not-need-handholding.all.patch
0002-no-undefined-on.mingw.patch
0003-binary-stdin.all.patch
0004-no-need-for-dllexport.mingw.patch
0005-silent.mingw.patch)
sha256sums=('98f332f48951f47f23f70fd0379463aff7d7fb26f07e1e24e42ddef22cc6112a'
'9151f5a78e188fde7ff14e92b5d04d2a198d0916d7ad3dfcd556d0ebadc0b24b'
'a4234841bdc2e4432e1a7187317df5ef06c92693ba6019830c8540f3635905d3'
'de8f7e115aef6a0f365fce39d048136f183d6c046221722193f7ffb471e85e1e'
'c6b4d26198f3ab98dcf1db6fe384c9159d6a2e6b3b7bb18a4d58ef046c64b282'
'47cb6d31a4c1f236bfb0c57d2a600c0d225babe5c36b8a1e4313db0fe62e8213')
sha256sums=('cc35424f6019a88c6f52570b63e1baf50f62963a3eac52a03a800bb070d7c87d'
'89bab27e8fb97eb1ca59e353705f2a22cf4e9c570c22f599b9090d0fd344b035'
'01b00dfa83ad4af3dad944ddbe1f5b1da03fb9ea2b699d95c9da109391eec911')
prepare() {
cd ${_realname}-${pkgver}
patch -p1 -i ${srcdir}/0001-mingw32-does-not-need-handholding.all.patch
patch -p1 -i ${srcdir}/0002-no-undefined-on.mingw.patch
patch -p1 -i ${srcdir}/0003-binary-stdin.all.patch
patch -p1 -i ${srcdir}/0004-no-need-for-dllexport.mingw.patch
patch -p1 -i ${srcdir}/0005-silent.mingw.patch
WANT_AUTOMAKE=latest autoreconf -fi