cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Unlink and remove libmpcdec and mppenc (replaced by musepack)

Browse Source 
ok ajacoutot@
This commit is contained in:
shadchin 2012-05-24 18:57:13 +00:00
parent 9c70d0b5fc
commit 78540d85ec
20 changed files with 1 additions and 309 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
audio/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.278 2012/05/24 18:30:58 shadchin Exp $
# $OpenBSD: Makefile,v 1.279 2012/05/24 18:57:13 shadchin Exp $
# $FreeBSD: Makefile,v 1.40 1997/11/16 22:49:20 fenner Exp $
SUBDIR =
@ -78,7 +78,6 @@
SUBDIR += libmikmod
SUBDIR += libmodplug
SUBDIR += libmp3splt
SUBDIR += libmpcdec
SUBDIR += libmpd
SUBDIR += libmpdclient
SUBDIR += libmusicbrainz
@ -119,7 +118,6 @@
SUBDIR += mpegaudio
SUBDIR += mpg123
SUBDIR += mpg321
SUBDIR += mppenc
SUBDIR += mt-daapd
SUBDIR += multimux
SUBDIR += musepack

32
audio/libmpcdec/Makefile
View File

@ -1,32 +0,0 @@
# $OpenBSD: Makefile,v 1.7 2009/08/24 15:27:49 sthen Exp $
COMMENT= musepack decoder library
DISTNAME= libmpcdec-1.2.6
SHARED_LIBS += mpcdec 3.0 # .5.2
CATEGORIES= audio
HOMEPAGE= http://www.musepack.net/
MAINTAINER= David Love <david@homeunix.org.uk>
MASTER_SITES= http://files.musepack.net/source/
EXTRACT_SUFX= .tar.bz2
# BSD
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
pre-configure:
@perl -pi -e 's|-O3\ -fomit-frame-pointer||g' ${WRKSRC}/configure
post-install:
${INSTALL} ${WRKBUILD}/src/sample ${PREFIX}/bin/mpc2wav
USE_LIBTOOL= Yes
WANTLIB= c m stdc++
CONFIGURE_STYLE=gnu
.include <bsd.port.mk>

5
audio/libmpcdec/distinfo
View File

@ -1,5 +0,0 @@
MD5 (libmpcdec-1.2.6.tar.bz2) = f3oGDoO0J4rPS3fXp7nSwA==
RMD160 (libmpcdec-1.2.6.tar.bz2) = lxc6HAN8G+dI+w035/t3UGEEhts=
SHA1 (libmpcdec-1.2.6.tar.bz2) = MhOf9ctDoY98mWN9p2cDxjpVSFo=
SHA256 (libmpcdec-1.2.6.tar.bz2) = S9VJKagIUHVPJ7Vo14keHj4bjS8gjTcfJ9H9oJ5vEqg=
SIZE (libmpcdec-1.2.6.tar.bz2) = 250302

12
audio/libmpcdec/patches/patch-include_mpcdec_config_types_h_in
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-include_mpcdec_config_types_h_in,v 1.1 2006/12/24 22:45:35 steven Exp $
--- include/mpcdec/config_types.h.in.orig Mon Dec 11 11:50:54 2006
+++ include/mpcdec/config_types.h.in Mon Dec 11 11:51:37 2006
@@ -35,6 +35,8 @@
#ifndef __MUSEPACK_CONFIG_TYPES_H__
#define __MUSEPACK_CONFIG_TYPES_H__
+#include <stdint.h>
+
typedef unsigned char mpc_bool_t;
#define TRUE 1
#define FALSE 0

12
audio/libmpcdec/patches/patch-src_sample_cpp
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_sample_cpp,v 1.1 2006/12/24 22:45:35 steven Exp $
--- src/sample.cpp.orig Mon Dec 11 10:21:39 2006
+++ src/sample.cpp Mon Dec 11 10:22:05 2006
@@ -270,7 +270,7 @@ main(int argc, char **argv)
/* instantiate a decoder with our file reader */
mpc_decoder_setup(&decoder, &reader);
if (!mpc_decoder_initialize(&decoder, &info)) {
- printf("Error initializing decoder.\n", argv[1]);
+ printf("Error initializing decoder.\n");
return 1;
}

8
audio/libmpcdec/pkg/DESCR
View File

@ -1,8 +0,0 @@
Musepack is an audio compression format with a strong emphasis on high
quality. It's not lossless, but it is designed for transparency, so that
you won't be able to hear differences between the original wave file and
the much smaller MPC file.
It is based on the MPEG-1 Layer-2 / MP2 algorithms, but since 1997 it
has rapidly developed and vastly improved and is now at an advanced
stage in which it contains heavily optimized and patentless code.

2
audio/libmpcdec/pkg/PFRAG.shared
View File

@ -1,2 +0,0 @@
@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2006/03/10 09:43:37 espie Exp $
@lib lib/libmpcdec.so.${LIBmpcdec_VERSION}

14
audio/libmpcdec/pkg/PLIST
View File

@ -1,14 +0,0 @@
@comment $OpenBSD: PLIST,v 1.3 2006/12/24 22:45:35 steven Exp $
%%SHARED%%
bin/mpc2wav
include/mpcdec/
include/mpcdec/config_types.h
include/mpcdec/decoder.h
include/mpcdec/huffman.h
include/mpcdec/math.h
include/mpcdec/mpcdec.h
include/mpcdec/reader.h
include/mpcdec/requant.h
include/mpcdec/streaminfo.h
lib/libmpcdec.a
lib/libmpcdec.la

26
audio/mppenc/Makefile
View File

@ -1,26 +0,0 @@
# $OpenBSD: Makefile,v 1.5 2010/09/06 00:04:28 sthen Exp $
COMMENT= musepack StreamVersion7 encoder
DISTNAME= mppenc-1.16
REVISION= 1
CATEGORIES= audio
HOMEPAGE= http://www.musepack.net/
# LGPL
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
MASTER_SITES= http://files2.musepack.net/source/
EXTRACT_SUFX= .tar.bz2
WANTLIB= c m ossaudio
MODULES= devel/cmake
NO_REGRESS= Yes
.include <bsd.port.mk>

5
audio/mppenc/distinfo
View File

@ -1,5 +0,0 @@
MD5 (mppenc-1.16.tar.bz2) = 8UVhQSg4FO/MASz6FWCbxg==
RMD160 (mppenc-1.16.tar.bz2) = bpe/wka52xFTKmKK+6YxiDaHVU0=
SHA1 (mppenc-1.16.tar.bz2) = 99yJixTgvZVJQcYkNaYsI6+Jy4o=
SHA256 (mppenc-1.16.tar.bz2) = +QeBhWynts4exwMzIfrbzQT+Jk0DScILSa0F98smVa0=
SIZE (mppenc-1.16.tar.bz2) = 105569

16
audio/mppenc/patches/patch-CMakeLists_txt
View File

@ -1,16 +0,0 @@
$OpenBSD: patch-CMakeLists_txt,v 1.1.1.1 2006/12/19 19:15:25 steven Exp $
--- CMakeLists.txt.orig Fri Nov 10 23:29:23 2006
+++ CMakeLists.txt Tue Dec 19 20:11:22 2006
@@ -1,9 +1,11 @@
CMAKE_MINIMUM_REQUIRED(VERSION 2.4)
+include(TestBigEndian)
project(mppenc C)
set(CMAKE_VERBOSE_MAKEFILE false)
+TEST_BIG_ENDIAN(WORDS_BIGENDIAN)
if(NOT MSVC)
-set(CMAKE_C_FLAGS "-O2 -ffast-math -fomit-frame-pointer -pipe")
+set(CMAKE_C_FLAGS "-O2 -ffast-math -fomit-frame-pointer -pipe ${CMAKE_C_FLAGS}")
endif(NOT MSVC)
add_subdirectory(src)

12
audio/mppenc/patches/patch-src_CMakeLists_txt
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_CMakeLists_txt,v 1.1.1.1 2006/12/19 19:15:25 steven Exp $
--- src/CMakeLists.txt.orig Wed Nov 8 19:53:41 2006
+++ src/CMakeLists.txt Tue Dec 19 14:32:43 2006
@@ -1,4 +1,7 @@
-add_definitions(-DMPP_ENCODER -DFAST_MATH -DCVD_FASTLOG)
+add_definitions(-DMPP_ENCODER -DFAST_MATH)
+if(WORDS_BIGENDIAN)
+add_definitions(-DWORDS_BIGENDIAN)
+endif(WORDS_BIGENDIAN)
add_executable(mppenc analy_filter encode_sv7 huffsv7 profile stderr winmsg ans fastmath keyboard psy tags bitstream fft4g mppenc psy_tab tools cvd fft_routines pipeopen quant wave_in)
if(WIN32)

39
audio/mppenc/patches/patch-src_bitstream_c
View File

@ -1,39 +0,0 @@
$OpenBSD: patch-src_bitstream_c,v 1.1.1.1 2006/12/19 19:15:25 steven Exp $
--- src/bitstream.c.orig Fri Nov 3 22:48:56 2006
+++ src/bitstream.c Tue Dec 19 09:26:37 2006
@@ -35,7 +35,7 @@ UintMax_t BufferedBits = 0; /
* is poison for old 16-bit compilers!
*/
-#if ENDIAN == HAVE_BIG_ENDIAN
+#ifdef WORDS_BIGENDIAN
static void
Change_Endian32 ( unsigned int* dst, size_t words32bit )
@@ -62,7 +62,7 @@ Change_Endian32 ( unsigned int* dst, siz
return;
}
-#endif /* ENDIAN == HAVE_BIG_ENDIAN */
+#endif /* WORDS_BIGENDIAN */
void
@@ -71,7 +71,7 @@ FlushBitstream ( FILE* fp, const Uint32_
size_t WrittenDwords = 0;
const Uint32_t* p = buffer;
-#if ENDIAN == HAVE_BIG_ENDIAN
+#ifdef WORDS_BIGENDIAN
size_t CC = words32bit;
Change_Endian32 ( (Uint32_t*)buffer, CC );
#endif
@@ -89,7 +89,7 @@ FlushBitstream ( FILE* fp, const Uint32_
}
} while ( words32bit != 0 );
-#if ENDIAN == HAVE_BIG_ENDIAN
+#ifdef WORDS_BIGENDIAN
Change_Endian32 ( (Uint32_t*)buffer, CC );
#endif
}

17
audio/mppenc/patches/patch-src_config_h
View File

@ -1,17 +0,0 @@
$OpenBSD: patch-src_config_h,v 1.1.1.1 2006/12/19 19:15:25 steven Exp $
--- src/config.h.orig Fri Nov 3 22:48:56 2006
+++ src/config.h Tue Dec 19 09:26:37 2006
@@ -17,13 +17,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-/* Determine Endianess of the machine */
-
-#define HAVE_LITTLE_ENDIAN 1234
-#define HAVE_BIG_ENDIAN 4321
-
-#define ENDIAN HAVE_LITTLE_ENDIAN
-
/* Test the fast float-to-int rounding trick works */

17
audio/mppenc/patches/patch-src_cvd_c
View File

@ -1,17 +0,0 @@
$OpenBSD: patch-src_cvd_c,v 1.1.1.1 2006/12/19 19:15:25 steven Exp $
--- src/cvd.c.orig Fri Nov 10 21:04:46 2006
+++ src/cvd.c Tue Dec 19 09:26:37 2006
@@ -222,10 +222,10 @@ logfast ( float x )
tmp.d = x * x;
tmp.d *= tmp.d;
tmp.d *= tmp.d;
-#if ENDIAN == HAVE_LITTLE_ENDIAN
- return (tmp.n[1] + (45127.5 - 1072693248.)) * ( M_LN2 / (1L<<23) );
-#else
+#ifdef WORDS_BIGENDIAN
return (tmp.n[0] + (45127.5 - 1072693248.)) * ( M_LN2 / (1L<<23) );
+#else
+ return (tmp.n[1] + (45127.5 - 1072693248.)) * ( M_LN2 / (1L<<23) );
#endif
}

37
audio/mppenc/patches/patch-src_mppdec_h
View File

@ -1,37 +0,0 @@
$OpenBSD: patch-src_mppdec_h,v 1.1.1.1 2006/12/19 19:15:25 steven Exp $
--- src/mppdec.h.orig Fri Nov 3 22:48:56 2006
+++ src/mppdec.h Tue Dec 19 09:26:37 2006
@@ -130,8 +130,6 @@
# undef USE_ASM
# undef USE_ESD_AUDIO
# define NO_DEV_AUDIO
-# undef ENDIAN
-# define ENDIAN HAVE_BIG_ENDIAN
#endif
#if defined __TURBOC__
@@ -999,15 +997,6 @@ extern Bool_t MS_Band
extern Bool_t MS_used; // global flag for M/S-signal guidance
extern Bool_t IS_used;
-#define LITTLE 0
-#define BIG 1
-extern Bool_t output_endianess;
-#if ENDIAN == HAVE_LITTLE_ENDIAN
-# define machine_endianess LITTLE
-#elif ENDIAN == HAVE_BIG_ENDIAN
-# define machine_endianess BIG
-#endif
-
// requant.c
extern Float __SCF [6 + 128]; // tabulated Scalefactors from -6 to +127
#define SCF ( __SCF + 6 )
@@ -1132,7 +1121,7 @@ int Cdecl stderr_printf (
long treewalk ( const char* start, const char** mask, int (*fn)(const char* filename, void* aux), void* aux );
void mysetargv ( int* argc, char*** argv, const char** extentions );
-#if ENDIAN == HAVE_BIG_ENDIAN
+#ifdef WORDS_BIGENDIAN
# define ReadLE32(dst,psrc) dst = *(Uint32_t*)(psrc)
# define ReadBE32(dst,psrc) \

30
audio/mppenc/patches/patch-src_tools_c
View File

@ -1,30 +0,0 @@
$OpenBSD: patch-src_tools_c,v 1.1.1.1 2006/12/19 19:15:25 steven Exp $
--- src/tools.c.orig Fri Nov 3 22:48:56 2006
+++ src/tools.c Tue Dec 19 09:26:37 2006
@@ -82,7 +82,7 @@ isdir ( const char* Name )
* is poison for old 16-bit compilers!
*/
-#if ENDIAN == HAVE_BIG_ENDIAN
+#ifdef WORDS_BIGENDIAN
static void
Change_Endian32 ( Uint32_t* dst, size_t words32bit )
@@ -109,7 +109,7 @@ Change_Endian32 ( Uint32_t* dst, size_t
return;
}
-#endif /* ENDIAN == HAVE_BIG_ENDIAN */
+#endif /* WORDS_BIGENDIAN */
/*
@@ -127,7 +127,7 @@ Read_LittleEndians ( FILE_T fp, Uint32_t
ENTER(161);
wordsread = READ ( fp, dst, words32bit * sizeof(*dst) ) / sizeof(*dst);
-#if ENDIAN == HAVE_BIG_ENDIAN
+#ifdef WORDS_BIGENDIAN
Change_Endian32 ( dst, wordsread );
#endif

12
audio/mppenc/patches/patch-src_wave_in_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_wave_in_c,v 1.1.1.1 2006/12/19 19:15:25 steven Exp $
--- src/wave_in.c.orig Fri Nov 3 22:48:56 2006
+++ src/wave_in.c Tue Dec 19 09:26:37 2006
@@ -299,7 +299,7 @@ Read_WAV_Samples ( wave_t* t,
memset ( c + ReadSamples * t->Channels * t->BytesPerSample, t->BytesPerSample == 1 ? 0x80 : 0, (RequestedSamples - ReadSamples) * (t->BytesPerSample * t->Channels) );
// Convert to float and calculate M=(L+R)/2 and S=(L-R)/2 signals
-#if ENDIAN == HAVE_LITTLE_ENDIAN
+#ifndef WORDS_BIGENDIAN
if ( t->BytesPerSample == 2 ) {
switch ( t->Channels ) {
case 1:

8
audio/mppenc/pkg/DESCR
View File

@ -1,8 +0,0 @@
Musepack is an audio compression format with a strong emphasis on high
quality. It's not lossless, but it is designed for transparency, so that
you won't be able to hear differences between the original wave file and
the much smaller MPC file.
It is based on the MPEG-1 Layer-2 / MP2 algorithms, but since 1997 it
has rapidly developed and vastly improved and is now at an advanced
stage in which it contains heavily optimized and patentless code.

2
audio/mppenc/pkg/PLIST
View File

@ -1,2 +0,0 @@
@comment $OpenBSD: PLIST,v 1.2 2009/03/14 18:38:05 ajacoutot Exp $
@bin bin/mppenc