From 0668c92599f936f4a30d5876c9d29957ae09c3fe Mon Sep 17 00:00:00 2001 From: Nagy Karoly Gabriel Date: Wed, 18 Apr 2007 00:24:41 +0000 Subject: [PATCH] * renamed musepack-tools -> mppenc * adapted conf file to latest version (1.16) of mppenc and updated cache file git-svn-id: svn://svn.opensde.net/opensde/package/trunk@20810 10447126-35f2-4685-b0cf-6dd780d3921f --- .../mppenc.cache} | 11 +++--- .../mppenc.conf} | 16 +++------ .../mppenc.desc} | 17 +++++---- audio/musepack-tools/gcc4.patch | 27 -------------- audio/musepack-tools/undef_irix_esd.patch | 36 ------------------- 5 files changed, 17 insertions(+), 90 deletions(-) rename audio/{musepack-tools/musepack-tools.cache => mppenc/mppenc.cache} (57%) rename audio/{musepack-tools/musepack-tools.conf => mppenc/mppenc.conf} (54%) rename audio/{musepack-tools/musepack-tools.desc => mppenc/mppenc.desc} (62%) delete mode 100644 audio/musepack-tools/gcc4.patch delete mode 100644 audio/musepack-tools/undef_irix_esd.patch diff --git a/audio/musepack-tools/musepack-tools.cache b/audio/mppenc/mppenc.cache similarity index 57% rename from audio/musepack-tools/musepack-tools.cache rename to audio/mppenc/mppenc.cache index ec267fef2..e3c79c339 100644 --- a/audio/musepack-tools/musepack-tools.cache +++ b/audio/mppenc/mppenc.cache @@ -1,24 +1,21 @@ -[TIMESTAMP] 1164602021 Mon Nov 27 06:33:41 2006 -[BUILDTIME] 10 (5) -[SIZE] 0.30 MB, 9 files +[TIMESTAMP] 1176852205 Wed Apr 18 02:23:25 2007 +[BUILDTIME] 5 (5) +[SIZE] 0.13 MB, 8 files -[DEP] 00-dirtree [DEP] bash [DEP] binutils [DEP] bzip2 +[DEP] cmake [DEP] coreutils [DEP] diffutils [DEP] findutils [DEP] gawk [DEP] gcc [DEP] glibc -[DEP] glibc32 [DEP] grep [DEP] linux-header [DEP] make -[DEP] nasm -[DEP] patch [DEP] sed [DEP] sysfiles [DEP] tar diff --git a/audio/musepack-tools/musepack-tools.conf b/audio/mppenc/mppenc.conf similarity index 54% rename from audio/musepack-tools/musepack-tools.conf rename to audio/mppenc/mppenc.conf index 0299f60f9..0890cef59 100644 --- a/audio/musepack-tools/musepack-tools.conf +++ b/audio/mppenc/mppenc.conf @@ -1,8 +1,8 @@ # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # -# Filename: package/.../musepack-tools/musepack-tools.conf -# Copyright (C) 2006 The OpenSDE Project +# Filename: package/.../mppenc/mppenc.conf +# Copyright (C) 2007 The OpenSDE Project # # More information can be found in the files COPYING and README. # @@ -12,13 +12,7 @@ # GNU General Public License can be found in the file COPYING. # --- SDE-COPYRIGHT-NOTE-END --- -var_append makeopt " " "mppenc mppdec replaygain" -makeinstopt= -hook_add postmake 4 'cp -v mppenc mppdec replaygain $root/$bindir' +hook_add preconf 3 "cmake ." +makeinstopt= +hook_add postmake 4 'cp -fv src/mppenc $root$bindir' -# it wants to write /dev/tty for logging -if [ -e $root/dev/fd/1 ]; then - var_append makeopt ' ' 'LOGFILE=/dev/fd/1' -else - abort "/dev/fd/1 not found, and this package needs it" -fi diff --git a/audio/musepack-tools/musepack-tools.desc b/audio/mppenc/mppenc.desc similarity index 62% rename from audio/musepack-tools/musepack-tools.desc rename to audio/mppenc/mppenc.desc index 6032fa96f..ffe7e36c2 100644 --- a/audio/musepack-tools/musepack-tools.desc +++ b/audio/mppenc/mppenc.desc @@ -1,8 +1,8 @@ [COPY] --- SDE-COPYRIGHT-NOTE-BEGIN --- [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. [COPY] -[COPY] Filename: package/.../musepack-tools/musepack-tools.desc -[COPY] Copyright (C) 2006 The OpenSDE Project +[COPY] Filename: package/.../mppenc/mppenc.desc +[COPY] Copyright (C) 2006 - 2007 The OpenSDE Project [COPY] [COPY] More information can be found in the files COPYING and README. [COPY] @@ -12,11 +12,10 @@ [COPY] GNU General Public License can be found in the file COPYING. [COPY] --- SDE-COPYRIGHT-NOTE-END --- -[I] Musepack is a lossy audio compression format. +[I] Encoder for Musepack. -[T] Musepack is an audio compression format with a strong emphasis on high quality. -[T] It's not lossless, but it is designed for transparency, so that you won't be -[T] able to hear differences between the original wave file and the much smaller MPC file. +[T] Musepack is an audio compression format with a strong emphasis on high +[T] quality. [U] http://www.musepack.net @@ -28,8 +27,8 @@ [L] LGPL [S] Stable -[V] 1.15v -[P] X -----5---9 126.400 +[V] 1.16 +[P] X -----5---9 127.400 -[D] 3746106182 mpcsv7-src-1.15v.tar.bz2 http://files2.musepack.net/source/ +[D] 603302768 mppenc-1.16.tar.bz2 http://files.musepack.net/source/ diff --git a/audio/musepack-tools/gcc4.patch b/audio/musepack-tools/gcc4.patch deleted file mode 100644 index a00a29d76..000000000 --- a/audio/musepack-tools/gcc4.patch +++ /dev/null @@ -1,27 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../musepack-tools/gcc4.patch -# Copyright (C) 2006 The OpenSDE Project -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# --- SDE-COPYRIGHT-NOTE-END --- - ---- sv7/mppenc.c.orig 2005-03-05 17:38:00.000000000 +0200 -+++ sv7/mppenc.c 2006-09-25 21:32:52.000000000 +0300 -@@ -1864,7 +1864,7 @@ - } - - --static void -+void - OverdriveReport ( void ) - { - if ( Overflows > 0 ) { // report internal clippings diff --git a/audio/musepack-tools/undef_irix_esd.patch b/audio/musepack-tools/undef_irix_esd.patch deleted file mode 100644 index 826e401eb..000000000 --- a/audio/musepack-tools/undef_irix_esd.patch +++ /dev/null @@ -1,36 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../musepack-tools/undef_irix_esd.patch -# Copyright (C) 2006 The OpenSDE Project -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# --- SDE-COPYRIGHT-NOTE-END --- - ---- sv7/mpp.h.orig 2004-11-20 17:03:58.000000000 +0200 -+++ sv7/mpp.h 2006-09-25 22:02:29.000000000 +0300 -@@ -40,7 +40,7 @@ - // If your Operating System supports the Enlightenment Sound Daemon you can output to /dev/esd and - // instead of writing a file the program plays the file via this sound device. - // you also must link the libesd library, so maybe you also must edit the Makefile --#define USE_ESD_AUDIO -+#undef USE_ESD_AUDIO - - #endif - -@@ -54,7 +54,7 @@ - // Sound support for SGI Irix - // If you have a SGI Workstation running IRIX, you can output to /dev/audio and - // instead of writing a file the program plays the file via this sound device. --#define USE_IRIX_AUDIO -+#undef USE_IRIX_AUDIO - - // Audio support for Windows (WAVE OUT) (only Windows) - // If you have a Windows based system and if you want also play files directly instead of only writing audio files,