initial commit, using own patch to use system flac-libs >= 1.1.3

(Portage version: 2.1.4_rc14)

6 files changed, 337 insertions, 0 deletions

diff --git a/media-sound/dvda-author/ChangeLog b/media-sound/dvda-author/ChangeLog
new file mode 100644
index 000000000000..a62dc7f16110
--- /dev/null
+++ b/media-sound/dvda-author/ChangeLog
@@ -0,0 +1,11 @@
+# ChangeLog for media-sound/dvda-author
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/dvda-author/ChangeLog,v 1.1 2008/01/06 02:46:01 sbriesen Exp $
+
+*dvda-author-20050703 (06 Jan 2008)
+
+  06 Jan 2008; Stefan Briesenick <sbriesen@gentoo.org>
+  +files/dvda-author-20050703-flac113.diff, +metadata.xml,
+  +dvda-author-20050703.ebuild:
+  initial commit, using own patch to use system flac-libs >= 1.1.3
+
diff --git a/media-sound/dvda-author/Manifest b/media-sound/dvda-author/Manifest
new file mode 100644
index 000000000000..9e5d9ea45d91
--- /dev/null
+++ b/media-sound/dvda-author/Manifest
@@ -0,0 +1,20 @@
+AUX dvda-author-20050703-flac113.diff 9539 RMD160 7d7446f596a4e2e1e76d3be5b08347de80e0ded3 SHA1 8d3e2f6981003af5db640bf2b0ada52c2c6c96e9 SHA256 ee72eeedb6e8461df97a37b8621c7ee213ea42d07fcd60ecc9b39f34e682e611
+MD5 ac2655945308ca24ed9de530373617e6 files/dvda-author-20050703-flac113.diff 9539
+RMD160 7d7446f596a4e2e1e76d3be5b08347de80e0ded3 files/dvda-author-20050703-flac113.diff 9539
+SHA256 ee72eeedb6e8461df97a37b8621c7ee213ea42d07fcd60ecc9b39f34e682e611 files/dvda-author-20050703-flac113.diff 9539
+DIST dvda-author-20050703-Linux.tar.gz 270036 RMD160 4278d5e49af6ad71c1cc3d22c5c6371e38e282b1 SHA1 befa476c500b3405cafcabb0f5e772885238d3f7 SHA256 db23f046686c6120d423ba195ec31f5e31e4b730b0efff56b07148008120fa21
+EBUILD dvda-author-20050703.ebuild 666 RMD160 8ed382169674181b0813ca1c83bafe331ca0a70d SHA1 66582a9148ea7f0cc57cd105611f4e5a51add2d2 SHA256 0abcdedaa74b1e9672d1aa3ec34bfd21e4d3f7f90bf0208aa7155a31f48cd7a4
+MD5 3c3c054916244d20c9f755fa5d8bf14f dvda-author-20050703.ebuild 666
+RMD160 8ed382169674181b0813ca1c83bafe331ca0a70d dvda-author-20050703.ebuild 666
+SHA256 0abcdedaa74b1e9672d1aa3ec34bfd21e4d3f7f90bf0208aa7155a31f48cd7a4 dvda-author-20050703.ebuild 666
+MISC ChangeLog 375 RMD160 aed37b0358fce82d9826ea78a2296e9a4c76adc5 SHA1 31007da0411b920ca1830306e4f115b1206ca208 SHA256 9839cad413c27aa6376db04cff38f7b2727cd9b383b4c119f456fa6520ee3d36
+MD5 03a5920fa395fb48bba7ed29e83897b9 ChangeLog 375
+RMD160 aed37b0358fce82d9826ea78a2296e9a4c76adc5 ChangeLog 375
+SHA256 9839cad413c27aa6376db04cff38f7b2727cd9b383b4c119f456fa6520ee3d36 ChangeLog 375
+MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
+SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b metadata.xml 158
+MD5 5774d9571d9588061758888fa7340a3d files/digest-dvda-author-20050703 280
+RMD160 acca884c6f1667b0235ae4f410c9699300de9cb6 files/digest-dvda-author-20050703 280
+SHA256 b76991335d2f9451d7e961da2499b8b2173d332e07f1a3ea44eaaceb6cf14144 files/digest-dvda-author-20050703 280
diff --git a/media-sound/dvda-author/dvda-author-20050703.ebuild b/media-sound/dvda-author/dvda-author-20050703.ebuild
new file mode 100644
index 000000000000..36df43c74728
--- /dev/null
+++ b/media-sound/dvda-author/dvda-author-20050703.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/dvda-author/dvda-author-20050703.ebuild,v 1.1 2008/01/06 02:46:01 sbriesen Exp $
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Author a DVD-Audio DVD"
+HOMEPAGE="http://dvd-audio.sourceforge.net/"
+SRC_URI="mirror://sourceforge/dvd-audio/${P}-Linux.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=media-libs/flac-1.1.3"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+src_unpack() {
+	unpack ${A}
+	epatch "${FILESDIR}/${P}-flac113.diff"
+}
+
+src_compile() {
+	emake -C src CC="$(tc-getCC)" || die "emake failed"
+}
+
+src_install() {
+	dobin src/dvda-author || die "install failed"
+	dodoc CHANGES README sort.txt
+}
diff --git a/media-sound/dvda-author/files/digest-dvda-author-20050703 b/media-sound/dvda-author/files/digest-dvda-author-20050703
new file mode 100644
index 000000000000..15666d5d6ec6
--- /dev/null
+++ b/media-sound/dvda-author/files/digest-dvda-author-20050703
@@ -0,0 +1,3 @@
+MD5 b0b212318469ee360df559ac84a0b39f dvda-author-20050703-Linux.tar.gz 270036
+RMD160 4278d5e49af6ad71c1cc3d22c5c6371e38e282b1 dvda-author-20050703-Linux.tar.gz 270036
+SHA256 db23f046686c6120d423ba195ec31f5e31e4b730b0efff56b07148008120fa21 dvda-author-20050703-Linux.tar.gz 270036
diff --git a/media-sound/dvda-author/files/dvda-author-20050703-flac113.diff b/media-sound/dvda-author/files/dvda-author-20050703-flac113.diff
new file mode 100644
index 000000000000..4a8d1cb7d1ac
--- /dev/null
+++ b/media-sound/dvda-author/files/dvda-author-20050703-flac113.diff
@@ -0,0 +1,266 @@
+diff -Naur dvda-author-20050703.orig/src/ats.c dvda-author-20050703/src/ats.c
+--- dvda-author-20050703.orig/src/ats.c	2007-10-08 23:11:28.000000000 +0200
++++ dvda-author-20050703/src/ats.c	2008-01-03 07:38:57.000000000 +0100
+@@ -346,7 +346,7 @@
+ int write_pes_packet(FILE* fp, fileinfo_t* info, uint8_t* audio_buf, int bytesinbuffer, uint64_t pack_in_title, int pack_in_file, int last_pack) {
+  uint64_t PTS;
+  uint64_t SCR;
+- int audio_bytes;
++ int audio_bytes = 0;
+  static int cc;  // Continuity counter - reset to 0 when pack_in_title=0
+  int lpcm_payload;
+ 
+diff -Naur dvda-author-20050703.orig/src/audio.c dvda-author-20050703/src/audio.c
+--- dvda-author-20050703.orig/src/audio.c	2007-10-08 23:11:28.000000000 +0200
++++ dvda-author-20050703/src/audio.c	2008-01-03 07:38:57.000000000 +0100
+@@ -30,7 +30,7 @@
+ #include <string.h>
+ #include "audio.h"
+ 
+-void flac_metadata_callback(const FLAC__FileDecoder *dec, const FLAC__StreamMetadata *meta, void *data) {
++void flac_metadata_callback(const FLAC__StreamDecoder *dec, const FLAC__StreamMetadata *meta, void *data) {
+   fileinfo_t *info = (fileinfo_t*) data;
+  
+   if (meta->type==FLAC__METADATA_TYPE_STREAMINFO) {
+@@ -41,7 +41,7 @@
+   }
+ }
+ 
+-FLAC__StreamDecoderWriteStatus flac_null_write_callback(const FLAC__FileDecoder *dec,
++FLAC__StreamDecoderWriteStatus flac_null_write_callback(const FLAC__StreamDecoder *dec,
+                                                         const FLAC__Frame *frame,
+                                                         const FLAC__int32 * const buf[],
+                                                         void *data)
+@@ -49,7 +49,7 @@
+     return FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE;
+ }
+ 
+-FLAC__StreamDecoderWriteStatus flac_write_callback(const FLAC__FileDecoder *dec,
++FLAC__StreamDecoderWriteStatus flac_write_callback(const FLAC__StreamDecoder *dec,
+                                                    const FLAC__Frame *frame,
+                                                    const FLAC__int32 * const buf[],
+                                                    void *data)
+@@ -84,7 +84,7 @@
+ 
+ 
+ 
+-void flac_error_callback(const FLAC__FileDecoder *dec,
++void flac_error_callback(const FLAC__StreamDecoder *dec,
+                          FLAC__StreamDecoderErrorStatus status, void *data)
+ {
+     fprintf(stderr, "ERR: FLAC error callback called.\n");
+@@ -133,34 +133,35 @@
+ }
+ 
+ int flac_getinfo(fileinfo_t* info) {
+-  FLAC__FileDecoder* flac;
+-  FLAC__FileDecoderState result;
++  FLAC__StreamDecoder* flac;
++  FLAC__StreamDecoderState result;
+ 
+-  flac=FLAC__file_decoder_new();
++  flac=FLAC__stream_decoder_new();
+ 
+   if (flac==NULL) {
+     fprintf(stderr,"ERR: Fatal error - could not create FLAC decoder\n"); 
+     return(1);
+   }
+-  FLAC__file_decoder_set_filename(flac,info->filename);
+-  FLAC__file_decoder_set_client_data(flac,(void*)info);
+-  FLAC__file_decoder_set_write_callback(flac,flac_null_write_callback);
+-  FLAC__file_decoder_set_error_callback(flac,flac_error_callback);
+-  FLAC__file_decoder_set_metadata_callback(flac,flac_metadata_callback);
+ 
+-  result=FLAC__file_decoder_init(flac);
+-  if (result!=FLAC__FILE_DECODER_OK) {
++  result=FLAC__stream_decoder_init_file(flac,
++    info->filename,
++    flac_null_write_callback,
++    flac_metadata_callback,
++    flac_error_callback,
++    (void*)info);
++
++  if (result!=FLAC__STREAM_DECODER_INIT_STATUS_OK) {
+     fprintf(stderr,"ERR: Failed to initialise FLAC decoder\n");
+-    FLAC__file_decoder_delete(flac);
++    FLAC__stream_decoder_delete(flac);
+     return(1);
+   }
+ 
+-  if (!FLAC__file_decoder_process_until_end_of_metadata(flac)) {
++  if (!FLAC__stream_decoder_process_until_end_of_metadata(flac)) {
+     fprintf(stderr,"ERR: Failed to read metadata from FLAC file\n");
+-    FLAC__file_decoder_delete(flac);
++    FLAC__stream_decoder_delete(flac);
+     return(1);
+   }
+-  FLAC__file_decoder_finish(flac);
++  FLAC__stream_decoder_finish(flac);
+ 
+   if (((info->bitspersample!=16) && (info->bitspersample!=24)) || (info->channels > 2)) {
+     return(1);
+@@ -169,7 +170,7 @@
+   info->type=AFMT_FLAC;
+   info->numbytes=info->numsamples*info->channels*(info->bitspersample/8);
+   calc_info(info);
+-  FLAC__file_decoder_delete(flac);
++  FLAC__stream_decoder_delete(flac);
+   return(0);
+ }
+ 
+@@ -203,7 +204,7 @@
+ }
+ 
+ int audio_open(fileinfo_t* info) {
+-  FLAC__FileDecoderState result;
++  FLAC__StreamDecoderState result;
+ 
+   info->audio=malloc(sizeof(audio_input_t));
+   if (info->type==AFMT_WAVE) {
+@@ -214,7 +215,7 @@
+     fseek(info->audio->fp,44,SEEK_SET);
+     info->audio->bytesread=0;
+   } else if (info->type==AFMT_FLAC) {
+-    info->audio->flac=FLAC__file_decoder_new();
++    info->audio->flac=FLAC__stream_decoder_new();
+     info->audio->n=0;
+     info->audio->eos=0;
+ 
+@@ -222,22 +223,23 @@
+       fprintf(stderr,"ERR: Fatal error - could not create FLAC decoder\n"); 
+       return(1);
+     }
+-    FLAC__file_decoder_set_filename(info->audio->flac,info->filename);
+-    FLAC__file_decoder_set_client_data(info->audio->flac,(void*)info);
+-    FLAC__file_decoder_set_write_callback(info->audio->flac,flac_write_callback);
+-    FLAC__file_decoder_set_error_callback(info->audio->flac,flac_error_callback);
+-    FLAC__file_decoder_set_metadata_callback(info->audio->flac,flac_metadata_callback);
+ 
+-    result=FLAC__file_decoder_init(info->audio->flac);
+-    if (result!=FLAC__FILE_DECODER_OK) {
++    result=FLAC__stream_decoder_init_file(info->audio->flac,
++      info->filename,
++      flac_write_callback,
++      flac_metadata_callback,
++      flac_error_callback,
++      (void*)info);
++
++    if (result!=FLAC__STREAM_DECODER_INIT_STATUS_OK) {
+       fprintf(stderr,"ERR: Failed to initialise FLAC decoder\n");
+-      FLAC__file_decoder_delete(info->audio->flac);
++      FLAC__stream_decoder_delete(info->audio->flac);
+       return(1);
+     }
+ 
+-    if (!FLAC__file_decoder_process_until_end_of_metadata(info->audio->flac)) {
++    if (!FLAC__stream_decoder_process_until_end_of_metadata(info->audio->flac)) {
+       fprintf(stderr,"ERR: Failed to read metadata from FLAC file\n");
+-      FLAC__file_decoder_delete(info->audio->flac);
++      FLAC__stream_decoder_delete(info->audio->flac);
+       return(1);
+     }
+   }
+@@ -248,7 +250,7 @@
+ int audio_read(fileinfo_t* info, uint8_t* buf, int count) {
+   uint32_t i;
+   uint8_t x;
+-  int n;
++  int n = 0;
+   int bytesread;
+   FLAC__bool result;
+ 
+@@ -271,12 +273,12 @@
+     n=bytesread;
+   } else if (info->type==AFMT_FLAC) {
+     while ((info->audio->n < count) && (info->audio->eos==0)) {
+-      result=FLAC__file_decoder_process_single(info->audio->flac);
++      result=FLAC__stream_decoder_process_single(info->audio->flac);
+       if (result==0) {
+ 	fprintf(stderr,"ERR: Fatal error decoding FLAC file\n");
+         exit(0);
+       }
+-      if (FLAC__file_decoder_get_state(info->audio->flac)==FLAC__FILE_DECODER_END_OF_FILE) {
++      if (FLAC__stream_decoder_get_state(info->audio->flac)==FLAC__STREAM_DECODER_END_OF_STREAM) {
+         info->audio->eos=1;
+       }
+     }
+@@ -369,7 +371,7 @@
+   if (info->type==AFMT_WAVE) {
+     fclose(info->audio->fp);
+   } else if (info->type==AFMT_FLAC) {
+-    FLAC__file_decoder_delete(info->audio->flac);
++    FLAC__stream_decoder_delete(info->audio->flac);
+   }
+   free(info->audio);
+   return(0);
+diff -Naur dvda-author-20050703.orig/src/audio.h dvda-author-20050703/src/audio.h
+--- dvda-author-20050703.orig/src/audio.h	2007-10-08 23:11:28.000000000 +0200
++++ dvda-author-20050703/src/audio.h	2008-01-03 07:38:57.000000000 +0100
+@@ -30,14 +30,14 @@
+ 
+ #include <stdio.h>
+ #include <stdint.h>
+-#include "libFLAC/include/FLAC/file_decoder.h"
++#include <FLAC/all.h>
+ 
+ #define AFMT_WAVE 1
+ #define AFMT_FLAC 2
+ 
+ typedef struct {
+   FILE* fp;
+-  FLAC__FileDecoder* flac;
++  FLAC__StreamDecoder* flac;
+   // Used for FLAC decoding:
+   uint8_t buf[1024*256];
+   int n;
+diff -Naur dvda-author-20050703.orig/src/dvda-author.c dvda-author-20050703/src/dvda-author.c
+--- dvda-author-20050703.orig/src/dvda-author.c	2007-10-08 23:11:28.000000000 +0200
++++ dvda-author-20050703/src/dvda-author.c	2008-01-03 07:38:57.000000000 +0100
+@@ -52,7 +52,7 @@
+   char audiotsdir[540];
+   char videotsdir[540];
+   fileinfo_t files[9][99];
+-  uint64_t totalsize;
++  uint64_t totalsize = 0;
+ 
+   fprintf(stderr,"dvda-author v" VERSION " - Copyright (C) 2005 Dave Chapman\n");
+   fprintf(stderr,"Latest version available from http://dvd-audio.sourceforge.net/\n\n");
+diff -Naur dvda-author-20050703.orig/src/Makefile dvda-author-20050703/src/Makefile
+--- dvda-author-20050703.orig/src/Makefile	2007-10-08 23:11:28.000000000 +0200
++++ dvda-author-20050703/src/Makefile	2008-01-03 07:39:25.000000000 +0100
+@@ -7,20 +7,16 @@
+ 
+ CC=$(CROSS)gcc
+ AR=$(CROSS)ar
+-CFLAGS=-Wall
+-LIBS=-lm
++CFLAGS+=-Wall
++LIBS=`pkg-config --libs flac`
+ TARGETS=dvda-author$(EXT)
+ OBJS=dvda-author.o audio.o ats.o atsi.o amg.o samg.o
+ 
+-FLACOPTS=-DVERSION=\"1.1.2\" -DFLAC__NO_ASM -DFLAC__ALIGN_MALLOC_DATA -I libFLAC/include
+-FLACSRC=$(wildcard libFLAC/*.c)
+-FLACOBJS=$(FLACSRC:%.c=%.o)
+-
+ .PHONY: all
+ all: $(TARGETS)
+ 
+-dvda-author$(EXT): $(OBJS) $(FLACOBJS)
+-	$(CC) $(CFLAGS) $(LIBS) -o $@ $^
++dvda-author$(EXT): $(OBJS)
++	$(CC) $(LIBS) $(LDFLAGS) -o $@ $^
+ 
+ dvda-author.o: dvda-author.c version.h audio.h ats.h atsi.h
+ ats.o: ats.c ats.h audio.h
+@@ -29,9 +25,6 @@
+ atsi.o: atsi.c atsi.h audio.h
+ audio.o: audio.c audio.h
+ 
+-libFLAC/%.o: libFLAC/%.c
+-	$(CC) $(CFLAGS) $(FLACOPTS) -c -o $@ $<
+-
+ .PHONY: clean
+ clean:
+-	rm -f $(TARGETS) $(OBJS) $(FLACOBJS) *~
++	rm -f $(TARGETS) $(OBJS) *~
diff --git a/media-sound/dvda-author/metadata.xml b/media-sound/dvda-author/metadata.xml
new file mode 100644
index 000000000000..e1774e3d9ad7
--- /dev/null
+++ b/media-sound/dvda-author/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+</pkgmetadata>