]> git.ipfire.org Git - ipfire-3.x.git/commitdiff
Moved to dvdrtools, because cdrtools had linking errors.
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 31 Mar 2009 20:11:38 +0000 (22:11 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 31 Mar 2009 20:11:38 +0000 (22:11 +0200)
Additionally, dvdrtools use autoconf.
-O0 is needed here.

lfs/dvdrtools [moved from lfs/cdrtools with 82% similarity]
make.sh

similarity index 82%
rename from lfs/cdrtools
rename to lfs/dvdrtools
index 14808b0badc8954764443b04f7e56734ba1eed6f..cdf4f13942fc94bd2507f2e5452682d949b6a11b 100644 (file)
 
 include Config
 
-PKG_NAME   = cdrtools
-PKG_VER    = 2.01.01a58
+PKG_NAME   = dvdrtools
+PKG_VER    = 0.2.1
 PKG_REL    = 0
 
 THISAPP    = $(PKG_NAME)-$(PKG_VER)
 DL_FILE    = $(THISAPP).tar.bz2
-DIR_APP    = $(DIR_SRC)/$(PKG_NAME)-2.01.01
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
 
 OBJECT     = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
 
@@ -40,13 +40,14 @@ EXTRA      = no
 DEBUG      = no
 DEPS       =
 
-URL        = http://cdrecord.berlios.de/private/cdrecord.html
-LICENSE    = CDDL GPLv2+
+URL        = http://savannah.nongnu.org/projects/dvdrtools/
+LICENSE    = GPLv2+
 SHORT_DESC = A set of command line programs that allows to record media.
 
 define LONG_DESC
-       Cdrtools is a set of command line programs that allows to record \
-       CD/DVD/BluRay media.
+       dvdrtools is a fork of cdrtools/cdrecord with support for writing to DVDs. \
+       While its primary purpose is writing data DVDs, it includes basic support \
+       for mastering video DVDs.
 endef
 
 ###############################################################################
@@ -75,8 +76,13 @@ $(objects):
 $(OBJECT): $(objects)
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && make INS_BASE=/usr DEFINSUSR=root DEFINSGRP=root \
-                                                LDFLAGS="-Wl,--no-fatal-warnings" $(PARALLELISMFLAGS)
-       cd $(DIR_APP) && make INS_BASE=/usr DEFINSUSR=root DEFINSGRP=root install
+       cd $(DIR_APP) && \
+               CFLAGS=$$(sed "s/-O2/-O0/g" <<<$$CFLAGS) \
+               ./configure \
+                       $(CONFIGURE_ARCH) \
+                       --prefix=/usr \
+                       --disable-static
+       cd $(DIR_APP) && make $(PARALLELISMFLAGS)
+       cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)
diff --git a/make.sh b/make.sh
index 964afaf660512467c6db827b6a404a81d2f2f380..7df55f512c0fb089a985106b9421442bbbad394c 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -325,7 +325,7 @@ ipfire_build() {
        ipfire_make logrotate
        #ipfire_make logwatch   
        ipfire_make cpio
-       ipfire_make cdrtools
+       ipfire_make dvdrtools
        ipfire_make python-parted
        ipfire_make python-pyblock
        ipfire_make libbdevid