[weasel-commit] Source: libcdio=0.80-2
- From: rbuilder@xxxxxxxxx
- To: weasel-commit@xxxxxxxxxxxxx
- Date: Fri, 29 Jan 2010 14:33:19 -0500
================================
libcdio:source=0.80-2 (previous: 0.80-1)
cvc rdiff libcdio -1 /weasel.rpath.org@wgl:3-devel/0.80-2
================================
0.80-2 Filip Brcic (brcha@xxxxxxx) Fri Jan 29 14:33:05 2010
fixed recipe + metadata
libcdio-0.80-fbsd.patch: new
--- /dev/null
+++ libcdio-0.80-fbsd.patch
@@ -0,0 +11 @@
+--- libcdio-0.80/lib/driver/FreeBSD/freebsd.h.old 2008-07-16 08:26:46
+0000
++++ libcdio-0.80/lib/driver/FreeBSD/freebsd.h 2008-07-16 08:26:54 +0000
+@@ -158,7 +158,7 @@
+ cdio_drive_write_cap_t *p_write_cap,
+ cdio_drive_misc_cap_t *p_misc_cap);
+
+-int get_media_changed_freebsd (const void *p_user_data);
++static int get_media_changed_freebsd (const void *p_user_data);
+
+ char *get_mcn_freebsd_ioctl (const _img_private_t *p_env);
+
libcdio.recipe: changed
Index: libcdio.recipe
====================================================================
contents(size sha1)
inode(mtime)
--- libcdio.recipe /weasel.rpath.org@wgl:3-devel/0.80-1
+++ libcdio.recipe /weasel.rpath.org@wgl:3-devel/0.80-2
@@ -1,34 +1,57 @@
#
-# Copyright (c) 2008 Foresight Linux
-# This file is distributed under the terms of the MIT License.
-# A copy is available at http://www.rpath.com/permanent/mit-license.html
+# Copyright (c) 2010 Filip Brcic <brcha@xxxxxxxxxxxx>
+# Distributed under the terms of the GNU General Public License v3
#
class Libcdio(AutoPackageRecipe):
name = 'libcdio'
version = '0.80'
-
+
buildRequires = [
- 'cdparanoia:runtime', 'install-info:runtime','libstdc++:devel',
'ncurses:devel',
- 'perl:runtime','pkg-config:devel'
+ 'autoconf:runtime', 'automake:runtime',
+ 'install-info:runtime', 'libcddb:devel', 'libstdc++:devel',
+ 'libtool:runtime', 'ncurses:devel', 'pkg-config:devel',
]
-
+
+ shortDesc = 'CD I/O library'
+ longDesc = 'A library to encapsulate CD-ROM reading and control'
+ url = 'http://www.gnu.org/software/libcdio/'
+ licenses = [ 'GPL-2' ]
+ categories = [ 'Development/Libraries' ]
+
def unpack(r):
- r.addArchive('http://ftp.gnu.org/gnu/libcdio/')
+ r.addArchive('mirror://gnu/%(name)s/')
- r.Run('sed -i "s/libudf.pc$/& \$(paranoiapcs)/" Makefile.in')
+ r.addPatch('libcdio-0.80-minimal.patch')
+ r.addPatch('libcdio-0.80-fix-pkgconfig.patch')
+ r.addPatch('libcdio-0.80-fbsd.patch')
- if Arch.x86_64:
- # First build 32bit version
- macros32 = r.macros.copy()
- macros32.cc = '"gcc -m32"'
- macros32.cxx = '"g++ -m32"'
- macros32.libdir = '%(prefix)s/lib'
+ r.Replace('noinst_PROGRAMS', 'EXTRA_PROGRAMS',
+ 'test/Makefile.am')
- r.Run('cp -a %(builddir)s %(builddir)s/../32bit')
+ r.Replace('@LIBICONV@', '$(LTLIBICONV)',
+ 'lib/driver/Makefile.am')
- r.Configure(dir='../32bit', overrideMacros=macros32)
- r.Make(dir='../32bit', overrideMacros=macros32)
- r.MakeInstall(dir='../32bit', overrideMacros=macros32)
+ r.addAction("""
+find . -name Makefile.am -print0 | xargs -0 sed -i -e
's:$(LIBICONV):$(LTLIBICONV):'
+""")
- r.NormalizePkgConfig(exceptions='.*')
+ r.Autoreconf(m4Dir='.')
+
+ def configure(r):
+ r.Configure(
+ ' --enable-cddb'
+ ' --with-cd-drive'
+ ' --with-cd-info'
+ ' --with-cd-paranoia'
+ ' --with-cdda-player'
+ ' --with-cd-read'
+ ' --with-iso-info'
+ ' --with-iso-read'
+ ' --enable-cxx'
+ ' --disable-example-progs --disable-cpp-progs'
+ ' --with-cd-paranoia-name=libcdio-paranoia'
+ ' --disable-vcd-info'
+ ' --disable-dependency-tracking'
+ ' --disable-maintainer-mode'
+ )
libcdio-0.80-fix-pkgconfig.patch: new
--- /dev/null
+++ libcdio-0.80-fix-pkgconfig.patch
@@ -0,0 +23 @@
+Index: libcdio-0.80/Makefile.am
+===================================================================
+--- libcdio-0.80.orig/Makefile.am
++++ libcdio-0.80/Makefile.am
+@@ -45,12 +45,15 @@ endif
+ # pkg-config(1) related rules
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = libcdio.pc \
+- libcdio++.pc \
+ libiso9660.pc \
+- libiso9660++.pc \
+- libudf.pc
++ libudf.pc \
+ $(paranoiapcs)
+
++if ENABLE_CPP
++pkgconfig_DATA += \
++ libcdio++.pc \
++ libiso9660++.pc
++endif
+
+ $(pkgconfig_DATA): config.status
+
libcdio-0.80-minimal.patch: new
--- /dev/null
+++ libcdio-0.80-minimal.patch
@@ -0,0 +81 @@
+Index: Makefile.am
+===================================================================
+RCS file: /sources/libcdio/libcdio/src/Makefile.am,v
+retrieving revision 1.45
+retrieving revision 1.46
+diff -u -B -r1.45 -r1.46
+--- src/Makefile.am 20 Mar 2008 19:02:38 -0000 1.45
++++ src/Makefile.am 24 Apr 2008 07:28:00 -0000 1.46
+@@ -17,11 +17,6 @@
+
+ GETOPT_C = getopt.c getopt1.c
+
+-man_MANS = cd-drive.1 cd-info.1 cd-read.1 iso-read.1 iso-info.1
+-EXTRA_DIST = cd-drive.help2man cd-info.help2man cd-read.help2man \
+- iso-info.help2man iso-read.help2man $(GETOPT_C) getopt.h \
+- $(man_MANS)
+-
+ noinst_HEADERS = cddb.h getopt.h util.h
+
+ ####################################################
+@@ -35,10 +30,6 @@
+ CDDB_LIBS=@CDDB_LIBS@
+ CDDA_PLAYER_LIBS=@CDDA_PLAYER_LIBS@
+
+-$(man_MANS): %.1: % %.help2man
+- -$(HELP2MAN) --opt-include=$<.help2man --no-info --output=$@ ./$<
+-MOSTLYCLEANFILES = $(man_MANS)
+-
+ if BUILD_CDDA_PLAYER
+ cdda_player_SOURCES = cdda-player.c cddb.c cddb.h $(GETOPT_C)
+ cdda_player_LDADD = $(LIBCDIO_LIBS) $(CDDB_LIBS) $(CDDA_PLAYER_LIBS)
+@@ -49,12 +40,14 @@
+ cd_drive_SOURCES = cd-drive.c util.c util.h $(GETOPT_C)
+ cd_drive_LDADD = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LIBICONV)
+ bin_cd_drive = cd-drive
++man_cd_drive = cd-drive.1
+ endif
+
+ if BUILD_CDINFO
+ cd_info_SOURCES = cd-info.c cddb.c cddb.h util.c util.h $(GETOPT_C)
+ cd_info_LDADD = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(CDDB_LIBS)
$(VCDINFO_LIBS) $(LIBICONV)
+ bin_cd_info = cd-info
++man_cd_info = cd-info.1
+ endif
+
+ if BUILD_CDINFO_LINUX
+@@ -67,18 +60,21 @@
+ cd_read_SOURCES = cd-read.c util.c util.h $(GETOPT_C)
+ cd_read_LDADD = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LIBICONV)
+ bin_cd_read = cd-read
++man_cd_read = cd-read.1
+ endif
+
+ if BUILD_ISO_INFO
+ iso_info_SOURCES = iso-info.c util.c util.h $(GETOPT_C)
+ iso_info_LDADD = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LIBICONV)
+ bin_iso_info = iso-info
++man_iso_info = iso-info.1
+ endif
+
+ if BUILD_ISO_READ
+ iso_read_SOURCES = iso-read.c util.c util.h $(GETOPT_C)
+ iso_read_LDADD = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LIBICONV)
+ bin_iso_read = iso-read
++man_iso_read = iso-read.1
+ endif
+
+ mmc_tool_SOURCES = mmc-tool.c util.c util.h $(GETOPT_C)
+@@ -88,3 +84,12 @@
+ 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)
+
+ INCLUDES = -I$(top_srcdir) $(LIBCDIO_CFLAGS) $(VCDINFO_CFLAGS) $(CDDB_CFLAGS)
++
++man_MANS = $(man_cd_drive) $(man_cd_info) $(man_cd_read) $(man_iso_read)
$(man_iso_info)
++EXTRA_DIST = cd-drive.help2man cd-info.help2man cd-read.help2man \
++ iso-info.help2man iso-read.help2man $(GETOPT_C) getopt.h \
++ $(man_MANS)
++
++$(man_MANS): %.1: % %.help2man
++ -$(HELP2MAN) --opt-include=$<.help2man --no-info --output=$@ ./$<
++MOSTLYCLEANFILES = $(man_MANS)
Committed by: brcha
Other related posts:
