[oe-commits] org.oe.dreambox libcdio: fix cdtextinfo

[tmbinc commit]

libcdio: fix cdtextinfo

Author: tmbinc at openembedded.org
Branch: org.openembedded.dreambox
Revision: b2b302d34cc68a1e7532375b4cf34d64a7ae18d8
ViewMTN: http://monotone.openembedded.org/revision/info/b2b302d34cc68a1e7532375b4cf34d64a7ae18d8
Files:
1
packages/libcdio/libcdio/libcdio-0.80-add-cdtextinfo.patch
packages/libcdio/libcdio_0.80.bb
Diffs:

#
# mt diff -r3bde4eaf4fb2dcfac3edf9642fe835e5b40fa8d1 -rb2b302d34cc68a1e7532375b4cf34d64a7ae18d8
#
#
#
# patch "packages/libcdio/libcdio/libcdio-0.80-add-cdtextinfo.patch"
#  from [076514e938772d1ea1329e56ea370059d038237c]
#    to [67e8c318f20e4c4d5f2c24835b24e6de14418481]
# 
# patch "packages/libcdio/libcdio_0.80.bb"
#  from [7f0cdc2a9ffc7b280498b7ad37691b6c938e479c]
#    to [b69e8ed84c09d490a9d5ca4fa0bd81dc9d6ba1fe]
#
============================================================
--- packages/libcdio/libcdio/libcdio-0.80-add-cdtextinfo.patch	076514e938772d1ea1329e56ea370059d038237c
+++ packages/libcdio/libcdio/libcdio-0.80-add-cdtextinfo.patch	67e8c318f20e4c4d5f2c24835b24e6de14418481
@@ -1,32 +1,7 @@
-Index: libcdio-0.80/configure.ac
+Index: libcdio-0.80/src/cdtextinfo.c
 ===================================================================
---- libcdio-0.80/configure.ac
-+++ libcdio-0.80/configure.ac
-@@ -605,6 +605,7 @@
-        test/testisocd2.c \
-        test/check_common_fn \
-        test/Makefile \
-+       cdtextinfo/Makefile \
-        ])
- 
- # AC_CONFIG_FILES([po/Makefile])
-Index: libcdio-0.80/Makefile.am
-===================================================================
---- libcdio-0.80/Makefile.am
-+++ libcdio-0.80/Makefile.am
-@@ -36,7 +36,7 @@
- 	libudf.pc.in \
- 	package/libcdio.spec.in 
- 
--SUBDIRS = doc include lib src test example
-+SUBDIRS = doc include lib src test cdtextinfo
- 
- if BUILD_CD_PARANOIA
- paranoiapcs = libcdio_paranoia.pc libcdio_cdda.pc
-Index: libcdio-0.80/cdtextinfo/cdtextinfo.c
-===================================================================
---- libcdio-0.80/cdtextinfo/cdtextinfo.c
-+++ libcdio-0.80/cdtextinfo/cdtextinfo.c
+--- libcdio-0.80/src/cdtextinfo.c
++++ libcdio-0.80/src/cdtextinfo.c
 @@ -0,0 +1,372 @@                                                                                                                                    
 +/*                                                                                                                                                  
 +  This program is free software; you can redistribute it and/or modify                                                                              
@@ -53,8 +28,8 @@ Index: libcdio-0.80/cdtextinfo/cdtextinf
 +#include <cddb/cddb.h>                                                                                                                              
 +#include <cdio/cdio.h>                                                                                                                              
 +#include <cdio/cdtext.h>                                                                                                                            
-+#include "../src/cddb.h"                                                                                                                            
-+#include "../src/getopt.h"                                                                                                                          
++#include "cddb.h"                                                                                                                            
++#include "getopt.h"                                                                                                                          
 +                                                                                                                                                    
 +struct opts_s                                                                                                                                       
 +{                                                                                                                                                   
@@ -400,15 +375,20 @@ Index: libcdio-0.80/cdtextinfo/cdtextinf
 +
 +    return 0;
 +}
-Index: libcdio-0.80/cdtextinfo/Makefile.am
+Index: libcdio-0.80/src/Makefile.am
 ===================================================================
---- libcdio-0.80/cdtextinfo/Makefile.am
-+++ libcdio-0.80/cdtextinfo/Makefile.am
-@@ -0,0 +1,7 @@
-+bin_PROGRAMS =  cdtextinfo
-+cdtextinfo_SOURCES = cdtextinfo.c
+--- libcdio-0.80/src/Makefile.am
++++ libcdio-0.80/src/Makefile.am       2008-07-29 09:56:06.000000000 +0000
+@@ -85,7 +85,12 @@
+ #mmc_tool_LDADD   = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LIBICONV)
+ #bin_mmc_tool     = mmc-tool
+
+-bin_PROGRAMS = $(bin_cd_drive) $(bin_cd_info)  $(bin_cdinfo_linux) $(bin_cd_read) $(bin_iso_info) $(bin_iso_read) $(bin_cdda_player) $(bin_mmc_tool)
++bin_cdtextinfo =  cdtextinfo
++cdtextinfo_SOURCES = cdtextinfo.c cddb.c cddb.h $(GETOPT_C)
++cdtextinfo_LDADD          = $(LIBCDIO_LIBS) $(LIBICONV) $(CDDB_LIBS)
++cdtextinfo_DEPENDENCIES   = $(LIBCDIO_DEPS)
 +
++bin_PROGRAMS = $(bin_cd_drive) $(bin_cd_info) $(bin_cdinfo_linux) $(bin_cd_read) $(bin_iso_info) $(bin_iso_read) $(bin_cdda_player) $(bin_mmc_tool) $(bin_cdtextinfo)
+
+ INCLUDES = -I$(top_srcdir) $(LIBCDIO_CFLAGS) $(VCDINFO_CFLAGS) $(CDDB_CFLAGS)
-+INCLUDES = -I$(top_srcdir) $(LIBCDIO_CFLAGS)
-+
-+cdtextinfo_DEPENDENCIES   = $(LIBCDIO_DEPS)
-+cdtextinfo_LDADD          = $(LIBCDIO_LIBS) $(LIBICONV)
============================================================
--- packages/libcdio/libcdio_0.80.bb	7f0cdc2a9ffc7b280498b7ad37691b6c938e479c
+++ packages/libcdio/libcdio_0.80.bb	b69e8ed84c09d490a9d5ca4fa0bd81dc9d6ba1fe
@@ -4,6 +4,7 @@ MAINTAINER = "Andreas Frisch <andreas.fr
 PRIORITY = "optional"
 LICENSE = "GPL"
 MAINTAINER = "Andreas Frisch <andreas.frisch at multimedia-labs.de>"
+PR="r1"
 
 SRC_URI = "http://ftp.gnu.org/pub/gnu/libcdio/${PN}-${PV}.tar.gz\
 	    file://${PN}-${PV}-configure-crosscompile.patch;patch=1\
@@ -20,7 +21,7 @@ do_compile_append () {
 
 do_compile_append () {
 	install -d ${D}${bindir}
-	install -m 0755 ${S}/cdtextinfo/.libs/cdtextinfo ${D}${bindir}
+	install -m 0755 ${S}/src/.libs/cdtextinfo ${D}${bindir}
 }
 
 do_stage () {