Commit 7b5375e2 authored by hartman's avatar hartman

* Add pkgcfg, libcddb, vcdimager and libcdio to OSX contrib system

* Fixed bootstrap to use pkg.m4 from contrib system
* Patches to make libcddb and vcdimager work
  (stupid bugs !, how do they compile with this on other system?)
parent 1b803dea
......@@ -360,7 +360,7 @@ fi
# Do the rest
${autopoint} -f
${aclocal} -I m4
${aclocal} -I m4 -I extras/contrib/share/aclocal
${autoconf}
${autoheader}
${automake} --add-missing --copy
......
......@@ -40,10 +40,11 @@ export LDFLAGS = -L$(PREFIX)/lib
# Standard rules
# ***************************************************************************
all: .autoconf .libtool .automake .iconv .intl .freetype .fribidi \
all: .autoconf .libtool .automake .iconv .intl .pkgcfg .freetype .fribidi \
.a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \
.FLAC .speex .faad .faac .lame .ebml .matroska .ffmpeg .openslp \
.dvdcss .dvdread .dvdnav .dvbpsi .live .goom .caca .dts .mod
.dvdcss .dvdread .dvdnav .dvbpsi .live .goom .caca .dts .mod \
.cddb .cdio .vcdimager
FORCE:
# ***************************************************************************
......@@ -175,6 +176,23 @@ CLEAN_FILE += .iconv
CLEAN_PKG += libiconv
DISTCLEAN_PKG += libiconv-$(LIBICONV_VERSION).tar.gz
# ***************************************************************************
# pkgconfig
# ***************************************************************************
pkgconfig-$(PKGCFG_VERSION).tar.gz:
$(WGET) $(PKGCFG_URL)
pkgconfig: pkgconfig-$(PKGCFG_VERSION).tar.gz
$(EXTRACT_GZ)
.pkgcfg: pkgconfig
(cd pkgconfig; ./configure --prefix=$(PREFIX) --disable-shared --enable-static && make && make install)
touch $@
CLEAN_FILE += .pkgcfg
CLEAN_PKG += pkgconfig
DISTCLEAN_PKG += pkgconfig-$(PKGCFG_VERSION).tar.gz
# ***************************************************************************
# gettext
# ***************************************************************************
......@@ -745,6 +763,62 @@ CLEAN_FILE += .mod
CLEAN_PKG += libmodplug
DISTCLEAN_PKG += libmodplug-$(MODPLUG_VERSION).tar.gz
# ***************************************************************************
# libcddb
# ***************************************************************************
libcddb-$(CDDB_VERSION).tar.gz:
$(WGET) $(CDDB_URL)
libcddb: libcddb-$(CDDB_VERSION).tar.gz
$(EXTRACT_GZ)
patch -p 0 < Patches/libcddb.patch
.cddb: libcddb
(cd $<; ./configure --prefix=$(PREFIX) --disable-shared --enable-static && make && make install)
touch $@
CLEAN_FILE += .cddb
CLEAN_PKG += libcddb
DISTCLEAN_PKG += libcddb-$(CDDB_VERSION).tar.gz
# ***************************************************************************
# vcdimager
# ***************************************************************************
vcdimager-$(VCDIMAGER_VERSION).tar.gz:
$(WGET) $(VCDIMAGER_URL)
vcdimager: vcdimager-$(VCDIMAGER_VERSION).tar.gz
$(EXTRACT_GZ)
patch -p 0 < Patches/vcdimager.patch
.vcdimager: vcdimager
(cd $<; ./configure --prefix=$(PREFIX) --disable-shared --enable-static && make && make install)
touch $@
CLEAN_FILE += .vcdimager
CLEAN_PKG += vcdimager
DISTCLEAN_PKG += vcdimager-$(VCDIMAGER_VERSION).tar.gz
# ***************************************************************************
# libcdio
# ***************************************************************************
libcdio-$(CDIO_VERSION).tar.gz:
$(WGET) $(CDIO_URL)
libcdio: libcdio-$(CDIO_VERSION).tar.gz
$(EXTRACT_GZ)
.cdio: libcdio
(cd $<; ./configure --prefix=$(PREFIX) --without-libcddb --without-vcdinfo && make && make install)
touch $@
CLEAN_FILE += .cdio
CLEAN_PKG += libcdio
DISTCLEAN_PKG += libcdio-$(CDIO_VERSION).tar.gz
# ***************************************************************************
# OpenMash
# ***************************************************************************
......
--- libcddb.orig/include/cddb/cddb_regex.h Mon Jul 5 02:12:12 2004
+++ libcddb/include/cddb/cddb_regex.h Sun Jul 4 22:05:44 2004
@@ -28,6 +28,7 @@
#include <stdlib.h>
+#include <unistd.h>
#include <regex.h>
--- vcdimager.orig/lib/image.c Mon Jul 5 02:17:50 2004
+++ vcdimager/lib/image.c Sun Jul 4 23:08:26 2004
@@ -76,7 +76,7 @@
}
int
-vcd_image_sink_write (VcdImageSink *obj, void *buf, uint32_t lsn)
+vcd_image_sink_write (VcdImageSink *obj, void *buf, lsn_t lsn)
{
vcd_assert (obj != NULL);
......@@ -32,6 +32,8 @@ AUTOCONF_URL=$(GNU)/autoconf/autoconf-$(AUTOCONF_VERSION).tar.gz
#LIBTOOL_URL=http://ftp.fr.debian.org/debian/pool/main/libt/libtool/libtool_$(LIBTOOL_VERSION).orig.tar.gz
AUTOMAKE_VERSION=1.7.8
AUTOMAKE_URL=$(GNU)/automake/automake-$(AUTOMAKE_VERSION).tar.gz
PKGCFG_VERSION=0.15.0
PKGCFG_URL=http://freedesktop.org/Software/pkgconfig/releases/pkgconfig-$(PKGCFG_VERSION).tar.gz
LIBICONV_VERSION=1.9.1
LIBICONV_URL=$(GNU)/libiconv/libiconv-$(LIBICONV_VERSION).tar.gz
GETTEXT_VERSION=0.12.1
......@@ -84,10 +86,10 @@ LIBDVDNAV_VERSION=0.1.10
LIBDVDNAV_URL=$(VIDEOLAN)/testing/contrib/libdvdnav-$(LIBDVDNAV_VERSION).tar.gz
LIBDVBPSI_VERSION=0.1.4
LIBDVBPSI_URL=$(VIDEOLAN)/libdvbpsi/$(LIBDVBPSI_VERSION)/libdvbpsi3-$(LIBDVBPSI_VERSION).tar.gz
LIVEDOTCOM_VERSION=2004.06.02
#LIVEDOTCOM_VERSION=2004.06.18
LIVEDOTCOM_URL=$(VIDEOLAN)/testing/contrib/live.$(LIVEDOTCOM_VERSION).tar.gz
#LIVEDOTCOM_URL=http://live.com/liveMedia/public/live.2004.06.18.tar.gz
#LIVEDOTCOM_VERSION=2004.06.02
LIVEDOTCOM_VERSION=2004.06.18
#LIVEDOTCOM_URL=$(VIDEOLAN)/testing/contrib/live.$(LIVEDOTCOM_VERSION).tar.gz
LIVEDOTCOM_URL=http://live.com/liveMedia/public/live.2004.06.18.tar.gz
GOOM_URL=$(VIDEOLAN)/testing/contrib/goom-macosx-altivec-bin.tar.gz
LIBCACA_VERSION=0.9
LIBCACA_URL=http://sam.zoy.org/projects/libcaca/libcaca-$(LIBCACA_VERSION).tar.gz
......@@ -97,4 +99,10 @@ MODPLUG_VERSION=0.7
MODPLUG_URL=$(VIDEOLAN)/testing/contrib/libmodplug-$(MODPLUG_VERSION).tar.gz
MASH_VERSION=5.2
MASH_URL=$(SF)/openmash/mash-src-$(MASH_VERSION).tar.gz
CDDB_VERSION=0.9.4
CDDB_URL=$(SF)/libcddb/libcddb-$(CDDB_VERSION).tar.gz
VCDIMAGER_VERSION=0.7.20
VCDIMAGER_URL=$(GNU)/vcdimager/vcdimager-$(VCDIMAGER_VERSION).tar.gz
CDIO_VERSION=0.69
CDIO_URL=$(GNU)/libcdio/libcdio-$(CDIO_VERSION).tar.gz
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment