rpms/amap/devel amap-destdir.patch, NONE, 1.1 amap-ldflags.patch, NONE, 1.1 amap-lnamap6.patch, NONE, 1.1 amap-new-homepage.patch, NONE, 1.1 amap-optflags.patch, NONE, 1.1 amap-path.patch, NONE, 1.1 amap-system-pcre.patch, NONE, 1.1 amap.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Michal Ambroz
Author: rebus
Update of /cvs/nonfree/rpms/amap/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv17868/devel
Modified Files:
.cvsignore sources
Added Files:
amap-destdir.patch amap-ldflags.patch amap-lnamap6.patch
amap-new-homepage.patch amap-optflags.patch amap-path.patch
amap-system-pcre.patch amap.spec
Log Message:
Initial import to devel branch
amap-destdir.patch:
Makefile.am | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
--- NEW FILE amap-destdir.patch ---
diff -urN amap-5.2/Makefile.am amap-5.2.new/Makefile.am
--- amap-5.2/Makefile.am 2005-09-22 17:39:18.000000000 +0200
+++ amap-5.2.new/Makefile.am 2008-09-18 18:14:01.000000000 +0200
@@ -34,15 +34,15 @@
$(CC) $(OPT_DEBUG) -o amapcrap amapcrap.c $(XLIBS) $(XLIBPATHS) $(XIPATHS) $(XDEFINES)
install: all
- @echo Installing to $(PREFIX), change this by running ./configure --prefix=path
- -mkdir -vp $(PREFIX)$(BINDIR) 2> /dev/null
- -mkdir -vp $(PREFIX)$(DATADIR) 2> /dev/null
- -mkdir -vp $(PREFIX)$(MANDIR) 2> /dev/null
- -test -e amap.exe || cp -f amap amap6 amapcrap $(PREFIX)$(BINDIR)
- -test -e amap.exe && cp -f amap.exe amapcrap.exe $(PREFIX)$(BINDIR) || echo
- -cp -f $(SCRIPTS) $(PREFIX)$(DATADIR)
- -cp -f $(MANPAGE) $(PREFIX)$(MANDIR)
- -test $(PREFIX)$(BINDIR)/amap6 || cd $(PREFIX)$(BINDIR) && ln -s amap amap6
+ @echo Installing to $(DESTDIR)$(PREFIX), change this by running ./configure --prefix=path
+ -mkdir -vp $(DESTDIR)$(PREFIX)$(BINDIR) 2> /dev/null
+ -mkdir -vp $(DESTDIR)$(PREFIX)$(DATADIR) 2> /dev/null
+ -mkdir -vp $(DESTDIR)$(PREFIX)$(MANDIR) 2> /dev/null
+ -test -e amap.exe || cp -f amap amap6 amapcrap $(DESTDIR)$(PREFIX)$(BINDIR)
+ -test -e amap.exe && cp -f amap.exe amapcrap.exe $(DESTDIR)$(PREFIX)$(BINDIR) || echo
+ -cp -f $(SCRIPTS) $(DESTDIR)$(PREFIX)$(DATADIR)
+ -cp -f $(MANPAGE) $(DESTDIR)$(PREFIX)$(MANDIR)
+ -test $(DESTDIR)$(PREFIX)$(BINDIR)/amap6 || cd $(DESTDIR)$(PREFIX)$(BINDIR) && ln -s amap amap6
clean:
cd pcre-3.9 && make clean
amap-ldflags.patch:
Makefile.am | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE amap-ldflags.patch ---
diff -urN amap-5.2/Makefile.am amap-5.2.new/Makefile.am
--- amap-5.2/Makefile.am 2005-09-22 17:39:18.000000000 +0200
+++ amap-5.2.new/Makefile.am 2008-09-18 18:42:52.000000000 +0200
@@ -17,11 +17,11 @@
amap: amap-lib.o amap.c
@echo
- $(CC) $(OPT) -o amap amap.c amap-lib.o $(LIB) $(XLIBS) $(XLIBPATHS) $(XIPATHS) $(XDEFINES)
+ $(CC) $(OPT) $(LDFLAGS) -o amap amap.c amap-lib.o $(LIB) $(XLIBS) $(XLIBPATHS) $(XIPATHS) $(XDEFINES)
test -e amap6 -o -e amap6.lnk || ln -s amap amap6
amapcrap: amapcrap.c
- $(CC) $(OPT) -o amapcrap amapcrap.c $(XLIBS) $(XLIBPATHS) $(XIPATHS) $(XDEFINES)
+ $(CC) $(OPT) $(LDFLAGS) -o amapcrap amapcrap.c $(XLIBS) $(XLIBPATHS) $(XIPATHS) $(XDEFINES)
@echo
strip: amap amapcrap
amap-lnamap6.patch:
Makefile.am | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE amap-lnamap6.patch ---
diff -ru amap-5.2.orig/Makefile.am amap-5.2/Makefile.am
--- amap-5.2.orig/Makefile.am 2010-03-21 14:32:23.000000000 +0100
+++ amap-5.2/Makefile.am 2010-03-21 15:56:37.000000000 +0100
@@ -38,11 +38,11 @@
-mkdir -vp $(DESTDIR)$(PREFIX)$(BINDIR) 2> /dev/null
-mkdir -vp $(DESTDIR)$(PREFIX)$(DATADIR) 2> /dev/null
-mkdir -vp $(DESTDIR)$(PREFIX)$(MANDIR) 2> /dev/null
- -test -e amap.exe || cp -f amap amap6 amapcrap $(DESTDIR)$(PREFIX)$(BINDIR)
+ -test -e amap.exe || cp -f amap amapcrap $(DESTDIR)$(PREFIX)$(BINDIR)
-test -e amap.exe && cp -f amap.exe amapcrap.exe $(DESTDIR)$(PREFIX)$(BINDIR) || echo
-cp -f $(SCRIPTS) $(DESTDIR)$(PREFIX)$(DATADIR)
-cp -f $(MANPAGE) $(DESTDIR)$(PREFIX)$(MANDIR)
- -test $(DESTDIR)$(PREFIX)$(BINDIR)/amap6 || cd $(DESTDIR)$(PREFIX)$(BINDIR) && ln -s amap amap6
+ -test -e $(DESTDIR)$(PREFIX)$(BINDIR)/amap6 || ln -s amap $(DESTDIR)$(PREFIX)$(BINDIR)/amap6
clean:
cd pcre-3.9 && make clean
amap-new-homepage.patch:
amap.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE amap-new-homepage.patch ---
diff -urN amap-5.2/amap.h amap-5.2.new/amap.h
--- amap-5.2/amap.h 2005-09-08 00:08:57.000000000 +0200
+++ amap-5.2.new/amap.h 2008-09-18 18:52:31.000000000 +0200
@@ -22,7 +22,7 @@
#define AMAP_YEAR "2005"
#define AMAP_AUTHOR "van Hauser"
#define AMAP_EMAIL "amap-dev(a)thc.org"
-#define AMAP_RESOURCE "www.thc.org/thc-amap"
+#define AMAP_RESOURCE "freeworld.thc.org/thc-amap"
#ifndef AMAP_PREFIX
#ifdef PREFIX
amap-optflags.patch:
Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE amap-optflags.patch ---
diff -ru amap-5.2/Makefile.am amap-5.2.orig/Makefile.am
--- amap-5.2/Makefile.am 2010-01-08 11:23:46.000000000 +0100
+++ amap-5.2.orig/Makefile.am 2010-01-08 11:23:31.000000000 +0100
@@ -1,6 +1,6 @@
CC=gcc
LIB=-lpcre
-OPT=-O2
+OPT+=-O2
OPT_DEBUG=-ggdb -Wall -lefence
BINDIR=/bin
DATADIR=/share/amap
amap-path.patch:
Makefile.am | 4 ++--
amap-lib.c | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
--- NEW FILE amap-path.patch ---
diff -urN amap-5.2/amap-lib.c amap-5.2.new/amap-lib.c
--- amap-5.2/amap-lib.c 2005-09-07 23:22:24.000000000 +0200
+++ amap-5.2.new/amap-lib.c 2008-09-18 18:29:01.000000000 +0200
@@ -306,7 +306,7 @@
strcpy(file_name, AMAP_PREFIX);
if (file_name[strlen(file_name) - 1] != '/')
strcat(file_name, "/");
- strcat(file_name, "etc/");
+ strcat(file_name, "share/amap/");
strcat(file_name, AMAP_DEFAULT_FILENAME);
strcat(file_name, extension);
f = fopen(file_name, "r");
@@ -2032,9 +2032,9 @@
if (opt->update) {
printf("Running Online Update for fingerprints, connecting to %s\n", AMAP_RESOURCE);
if (opt->filename == NULL) {
- opt->filename = malloc(strlen(AMAP_PREFIX) + 5 + strlen(AMAP_DEFAULT_FILENAME) + 2);
+ opt->filename = malloc(strlen(AMAP_PREFIX) + 12 + strlen(AMAP_DEFAULT_FILENAME) + 2);
strcpy(opt->filename, AMAP_PREFIX);
- strcat(opt->filename, "/etc/");
+ strcat(opt->filename, "/share/amap/");
strcat(opt->filename, AMAP_DEFAULT_FILENAME);
}
opt->file_log = malloc(strlen(opt->filename) + 6);
diff -urN amap-5.2/Makefile.am amap-5.2.new/Makefile.am
--- amap-5.2/Makefile.am 2005-09-22 17:39:18.000000000 +0200
+++ amap-5.2.new/Makefile.am 2008-09-18 18:32:07.000000000 +0200
@@ -3,8 +3,8 @@
OPT=-O2
OPT_DEBUG=-ggdb -Wall -lefence
BINDIR=/bin
-DATADIR=/etc
-MANDIR=/man/man1
+DATADIR=/share/amap
+MANDIR=/share/man/man1
SCRIPTS=appdefs.trig appdefs.resp appdefs.rpc
MANPAGE=amap.1
all: pcre strip
amap-system-pcre.patch:
amap-5.2.new/Makefile.am | 4 ++--
amap-5.2.new/amap-inc.h | 2 +-
amap-5.2/configure | 10 ++++------
3 files changed, 7 insertions(+), 9 deletions(-)
--- NEW FILE amap-system-pcre.patch ---
diff -urN amap-5.2/amap-inc.h amap-5.2.new/amap-inc.h
--- amap-5.2/amap-inc.h 2003-10-29 23:37:41.000000000 +0100
+++ amap-5.2.new/amap-inc.h 2008-09-18 18:54:40.000000000 +0200
@@ -20,7 +20,7 @@
#include <errno.h>
#include <sys/resource.h>
#include <sys/wait.h>
-#include "pcre-3.9/pcre.h"
+#include <pcre.h>
#ifdef OPENSSL
#include <openssl/ssl.h>
#include <openssl/err.h>
diff -urN amap-5.2/Makefile.am amap-5.2.new/Makefile.am
--- amap-5.2/Makefile.am 2005-09-22 17:39:18.000000000 +0200
+++ amap-5.2.new/Makefile.am 2008-09-18 18:55:34.000000000 +0200
@@ -1,5 +1,5 @@
CC=gcc
-LIB=-lpcre -L./pcre-3.9/ -I./pcre-3.9/
+LIB=-lpcre
OPT=-O2
OPT_DEBUG=-ggdb -Wall -lefence
BINDIR=/bin
@@ -8,6 +8,6 @@
SCRIPTS=appdefs.trig appdefs.resp appdefs.rpc
MANPAGE=amap.1
-all: pcre strip
+all: amap amapcrap
pcre:
cd pcre-3.9 && make
diff -ru amap-5.2.orig/configure amap-5.2/configure
--- amap-5.2.orig/configure 2010-03-21 14:32:23.000000000 +0100
+++ amap-5.2/configure 2010-03-26 19:02:49.000000000 +0100
@@ -13,15 +13,13 @@
exit 0
fi
-cd pcre-3.9 || exit 1
-./configure || exit 1
-cd ..
-
echo
echo
echo "Starting amap auto configuration ..."
rm -f Makefile.in
PREFIX=""
+PCRE_LIBS=`pcre-config --libs`
+PCRE_IPATH=`pcre-config --cflags`
SSL_PATH=""
SSL_IPATH=""
CRYPTO_PATH=""
@@ -123,9 +121,9 @@
echo
XDEFINES=""
-XLIBS=""
+XLIBS="$PCRE_LIBS"
XLIBPATHS=""
-XIPATHS=""
+XIPATHS="$PCRE_IPATH"
if [ -n "$SSL_PATH" ]; then
XDEFINES="$XDEFINES -DOPENSSL"
--- NEW FILE amap.spec ---
Name: amap
Version: 5.2
Release: 4%{?dist}
Summary: Network tool for application protocol detection
Group: Applications/System
License: AMAP License
#License AMAP non-commercial rules added to GPLv2
URL: http://freeworld.thc.org/thc-amap/
Source0: http://freeworld.thc.org/releases/%{name}-%{version}.tar.gz
Patch0: %{name}-destdir.patch
Patch1: %{name}-path.patch
Patch2: %{name}-ldflags.patch
Patch3: %{name}-new-homepage.patch
Patch4: %{name}-system-pcre.patch
Patch5: %{name}-optflags.patch
Patch6: %{name}-lnamap6.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: openssl-devel
BuildRequires: pcre-devel
%description
THC Amap is a next-generation tool for assisting network penetration testing.
It performs fast and reliable application protocol detection, independent
on the TCP/UDP port they are being bound to.
%prep
%setup -q
%patch0 -p1 -b .0destdir
%patch1 -p1 -b .1path
%patch2 -p1 -b .2ldflags
%patch3 -p1 -b .3homepage
%patch4 -p1 -b .4pcre
%patch5 -p1 -b .5optflags
%patch6 -p1 -b .6lnamap6
%build
#%%configure
./configure --prefix=%{_prefix} --libdir=%{_libdir}
OPT="$RPM_OPT_FLAGS" make %{?_smp_mflags}
%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}
%clean
rm -rf %{buildroot}
%files
%defattr(644,root,root,755)
%doc CHANGES README TODO LICENCE.AMAP LICENSE.GNU
%attr(755,root,root) %{_bindir}/*
%{_mandir}/man1/%{name}.1*
%{_datadir}/%{name}
%changelog
* Fri Mar 26 2010 Michal Ambroz <rebus at, seznam.cz> 5.2-4
- more flexible pcre cflags to build also on RHEL4
* Sun Mar 20 2010 Michal Ambroz <rebus at, seznam.cz> 5.2-3
- License changed to AMAP license to avoid confusion
- patch makefile to link to amap6 instead of copy
* Fri Jan 08 2010 Michal Ambroz <rebus at, seznam.cz> 5.2-2
- patched makefile & spec to honour RPM_OPT_FLAGS
- included verbatim copy of licenses
- RPM_OPT_FLAGS fixed build of debug package as well
- removed explicit dependency on openssl and pcre
* Tue Jan 05 2010 Michal Ambroz <rebus at, seznam.cz> 5.2-1
- Initial SPEC for Fedora 12 using SPEC and patches from PLD
- Original SPEC by luzik qboosh zbyniu baggins glen
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/amap/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 25 Mar 2010 22:16:43 -0000 1.1
+++ .cvsignore 27 Mar 2010 00:44:05 -0000 1.2
@@ -0,0 +1 @@
+amap-5.2.tar.gz
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/amap/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 25 Mar 2010 22:16:43 -0000 1.1
+++ sources 27 Mar 2010 00:44:05 -0000 1.2
@@ -0,0 +1 @@
+e3b1f5ebd24aac03aacb38ec183eb426 amap-5.2.tar.gz
14 years, 1 month
- 1
- 0
rpms/amap/F-13 amap-destdir.patch, NONE, 1.1 amap-ldflags.patch, NONE, 1.1 amap-lnamap6.patch, NONE, 1.1 amap-new-homepage.patch, NONE, 1.1 amap-optflags.patch, NONE, 1.1 amap-path.patch, NONE, 1.1 amap-system-pcre.patch, NONE, 1.1 amap.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Michal Ambroz
Author: rebus
Update of /cvs/nonfree/rpms/amap/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv17513/F-13
Modified Files:
.cvsignore sources
Added Files:
amap-destdir.patch amap-ldflags.patch amap-lnamap6.patch
amap-new-homepage.patch amap-optflags.patch amap-path.patch
amap-system-pcre.patch amap.spec
Log Message:
Initial import to branch F-13
amap-destdir.patch:
Makefile.am | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
--- NEW FILE amap-destdir.patch ---
diff -urN amap-5.2/Makefile.am amap-5.2.new/Makefile.am
--- amap-5.2/Makefile.am 2005-09-22 17:39:18.000000000 +0200
+++ amap-5.2.new/Makefile.am 2008-09-18 18:14:01.000000000 +0200
@@ -34,15 +34,15 @@
$(CC) $(OPT_DEBUG) -o amapcrap amapcrap.c $(XLIBS) $(XLIBPATHS) $(XIPATHS) $(XDEFINES)
install: all
- @echo Installing to $(PREFIX), change this by running ./configure --prefix=path
- -mkdir -vp $(PREFIX)$(BINDIR) 2> /dev/null
- -mkdir -vp $(PREFIX)$(DATADIR) 2> /dev/null
- -mkdir -vp $(PREFIX)$(MANDIR) 2> /dev/null
- -test -e amap.exe || cp -f amap amap6 amapcrap $(PREFIX)$(BINDIR)
- -test -e amap.exe && cp -f amap.exe amapcrap.exe $(PREFIX)$(BINDIR) || echo
- -cp -f $(SCRIPTS) $(PREFIX)$(DATADIR)
- -cp -f $(MANPAGE) $(PREFIX)$(MANDIR)
- -test $(PREFIX)$(BINDIR)/amap6 || cd $(PREFIX)$(BINDIR) && ln -s amap amap6
+ @echo Installing to $(DESTDIR)$(PREFIX), change this by running ./configure --prefix=path
+ -mkdir -vp $(DESTDIR)$(PREFIX)$(BINDIR) 2> /dev/null
+ -mkdir -vp $(DESTDIR)$(PREFIX)$(DATADIR) 2> /dev/null
+ -mkdir -vp $(DESTDIR)$(PREFIX)$(MANDIR) 2> /dev/null
+ -test -e amap.exe || cp -f amap amap6 amapcrap $(DESTDIR)$(PREFIX)$(BINDIR)
+ -test -e amap.exe && cp -f amap.exe amapcrap.exe $(DESTDIR)$(PREFIX)$(BINDIR) || echo
+ -cp -f $(SCRIPTS) $(DESTDIR)$(PREFIX)$(DATADIR)
+ -cp -f $(MANPAGE) $(DESTDIR)$(PREFIX)$(MANDIR)
+ -test $(DESTDIR)$(PREFIX)$(BINDIR)/amap6 || cd $(DESTDIR)$(PREFIX)$(BINDIR) && ln -s amap amap6
clean:
cd pcre-3.9 && make clean
amap-ldflags.patch:
Makefile.am | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE amap-ldflags.patch ---
diff -urN amap-5.2/Makefile.am amap-5.2.new/Makefile.am
--- amap-5.2/Makefile.am 2005-09-22 17:39:18.000000000 +0200
+++ amap-5.2.new/Makefile.am 2008-09-18 18:42:52.000000000 +0200
@@ -17,11 +17,11 @@
amap: amap-lib.o amap.c
@echo
- $(CC) $(OPT) -o amap amap.c amap-lib.o $(LIB) $(XLIBS) $(XLIBPATHS) $(XIPATHS) $(XDEFINES)
+ $(CC) $(OPT) $(LDFLAGS) -o amap amap.c amap-lib.o $(LIB) $(XLIBS) $(XLIBPATHS) $(XIPATHS) $(XDEFINES)
test -e amap6 -o -e amap6.lnk || ln -s amap amap6
amapcrap: amapcrap.c
- $(CC) $(OPT) -o amapcrap amapcrap.c $(XLIBS) $(XLIBPATHS) $(XIPATHS) $(XDEFINES)
+ $(CC) $(OPT) $(LDFLAGS) -o amapcrap amapcrap.c $(XLIBS) $(XLIBPATHS) $(XIPATHS) $(XDEFINES)
@echo
strip: amap amapcrap
amap-lnamap6.patch:
Makefile.am | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE amap-lnamap6.patch ---
diff -ru amap-5.2.orig/Makefile.am amap-5.2/Makefile.am
--- amap-5.2.orig/Makefile.am 2010-03-21 14:32:23.000000000 +0100
+++ amap-5.2/Makefile.am 2010-03-21 15:56:37.000000000 +0100
@@ -38,11 +38,11 @@
-mkdir -vp $(DESTDIR)$(PREFIX)$(BINDIR) 2> /dev/null
-mkdir -vp $(DESTDIR)$(PREFIX)$(DATADIR) 2> /dev/null
-mkdir -vp $(DESTDIR)$(PREFIX)$(MANDIR) 2> /dev/null
- -test -e amap.exe || cp -f amap amap6 amapcrap $(DESTDIR)$(PREFIX)$(BINDIR)
+ -test -e amap.exe || cp -f amap amapcrap $(DESTDIR)$(PREFIX)$(BINDIR)
-test -e amap.exe && cp -f amap.exe amapcrap.exe $(DESTDIR)$(PREFIX)$(BINDIR) || echo
-cp -f $(SCRIPTS) $(DESTDIR)$(PREFIX)$(DATADIR)
-cp -f $(MANPAGE) $(DESTDIR)$(PREFIX)$(MANDIR)
- -test $(DESTDIR)$(PREFIX)$(BINDIR)/amap6 || cd $(DESTDIR)$(PREFIX)$(BINDIR) && ln -s amap amap6
+ -test -e $(DESTDIR)$(PREFIX)$(BINDIR)/amap6 || ln -s amap $(DESTDIR)$(PREFIX)$(BINDIR)/amap6
clean:
cd pcre-3.9 && make clean
amap-new-homepage.patch:
amap.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE amap-new-homepage.patch ---
diff -urN amap-5.2/amap.h amap-5.2.new/amap.h
--- amap-5.2/amap.h 2005-09-08 00:08:57.000000000 +0200
+++ amap-5.2.new/amap.h 2008-09-18 18:52:31.000000000 +0200
@@ -22,7 +22,7 @@
#define AMAP_YEAR "2005"
#define AMAP_AUTHOR "van Hauser"
#define AMAP_EMAIL "amap-dev(a)thc.org"
-#define AMAP_RESOURCE "www.thc.org/thc-amap"
+#define AMAP_RESOURCE "freeworld.thc.org/thc-amap"
#ifndef AMAP_PREFIX
#ifdef PREFIX
amap-optflags.patch:
Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE amap-optflags.patch ---
diff -ru amap-5.2/Makefile.am amap-5.2.orig/Makefile.am
--- amap-5.2/Makefile.am 2010-01-08 11:23:46.000000000 +0100
+++ amap-5.2.orig/Makefile.am 2010-01-08 11:23:31.000000000 +0100
@@ -1,6 +1,6 @@
CC=gcc
LIB=-lpcre
-OPT=-O2
+OPT+=-O2
OPT_DEBUG=-ggdb -Wall -lefence
BINDIR=/bin
DATADIR=/share/amap
amap-path.patch:
Makefile.am | 4 ++--
amap-lib.c | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
--- NEW FILE amap-path.patch ---
diff -urN amap-5.2/amap-lib.c amap-5.2.new/amap-lib.c
--- amap-5.2/amap-lib.c 2005-09-07 23:22:24.000000000 +0200
+++ amap-5.2.new/amap-lib.c 2008-09-18 18:29:01.000000000 +0200
@@ -306,7 +306,7 @@
strcpy(file_name, AMAP_PREFIX);
if (file_name[strlen(file_name) - 1] != '/')
strcat(file_name, "/");
- strcat(file_name, "etc/");
+ strcat(file_name, "share/amap/");
strcat(file_name, AMAP_DEFAULT_FILENAME);
strcat(file_name, extension);
f = fopen(file_name, "r");
@@ -2032,9 +2032,9 @@
if (opt->update) {
printf("Running Online Update for fingerprints, connecting to %s\n", AMAP_RESOURCE);
if (opt->filename == NULL) {
- opt->filename = malloc(strlen(AMAP_PREFIX) + 5 + strlen(AMAP_DEFAULT_FILENAME) + 2);
+ opt->filename = malloc(strlen(AMAP_PREFIX) + 12 + strlen(AMAP_DEFAULT_FILENAME) + 2);
strcpy(opt->filename, AMAP_PREFIX);
- strcat(opt->filename, "/etc/");
+ strcat(opt->filename, "/share/amap/");
strcat(opt->filename, AMAP_DEFAULT_FILENAME);
}
opt->file_log = malloc(strlen(opt->filename) + 6);
diff -urN amap-5.2/Makefile.am amap-5.2.new/Makefile.am
--- amap-5.2/Makefile.am 2005-09-22 17:39:18.000000000 +0200
+++ amap-5.2.new/Makefile.am 2008-09-18 18:32:07.000000000 +0200
@@ -3,8 +3,8 @@
OPT=-O2
OPT_DEBUG=-ggdb -Wall -lefence
BINDIR=/bin
-DATADIR=/etc
-MANDIR=/man/man1
+DATADIR=/share/amap
+MANDIR=/share/man/man1
SCRIPTS=appdefs.trig appdefs.resp appdefs.rpc
MANPAGE=amap.1
all: pcre strip
amap-system-pcre.patch:
amap-5.2.new/Makefile.am | 4 ++--
amap-5.2.new/amap-inc.h | 2 +-
amap-5.2/configure | 10 ++++------
3 files changed, 7 insertions(+), 9 deletions(-)
--- NEW FILE amap-system-pcre.patch ---
diff -urN amap-5.2/amap-inc.h amap-5.2.new/amap-inc.h
--- amap-5.2/amap-inc.h 2003-10-29 23:37:41.000000000 +0100
+++ amap-5.2.new/amap-inc.h 2008-09-18 18:54:40.000000000 +0200
@@ -20,7 +20,7 @@
#include <errno.h>
#include <sys/resource.h>
#include <sys/wait.h>
-#include "pcre-3.9/pcre.h"
+#include <pcre.h>
#ifdef OPENSSL
#include <openssl/ssl.h>
#include <openssl/err.h>
diff -urN amap-5.2/Makefile.am amap-5.2.new/Makefile.am
--- amap-5.2/Makefile.am 2005-09-22 17:39:18.000000000 +0200
+++ amap-5.2.new/Makefile.am 2008-09-18 18:55:34.000000000 +0200
@@ -1,5 +1,5 @@
CC=gcc
-LIB=-lpcre -L./pcre-3.9/ -I./pcre-3.9/
+LIB=-lpcre
OPT=-O2
OPT_DEBUG=-ggdb -Wall -lefence
BINDIR=/bin
@@ -8,6 +8,6 @@
SCRIPTS=appdefs.trig appdefs.resp appdefs.rpc
MANPAGE=amap.1
-all: pcre strip
+all: amap amapcrap
pcre:
cd pcre-3.9 && make
diff -ru amap-5.2.orig/configure amap-5.2/configure
--- amap-5.2.orig/configure 2010-03-21 14:32:23.000000000 +0100
+++ amap-5.2/configure 2010-03-26 19:02:49.000000000 +0100
@@ -13,15 +13,13 @@
exit 0
fi
-cd pcre-3.9 || exit 1
-./configure || exit 1
-cd ..
-
echo
echo
echo "Starting amap auto configuration ..."
rm -f Makefile.in
PREFIX=""
+PCRE_LIBS=`pcre-config --libs`
+PCRE_IPATH=`pcre-config --cflags`
SSL_PATH=""
SSL_IPATH=""
CRYPTO_PATH=""
@@ -123,9 +121,9 @@
echo
XDEFINES=""
-XLIBS=""
+XLIBS="$PCRE_LIBS"
XLIBPATHS=""
-XIPATHS=""
+XIPATHS="$PCRE_IPATH"
if [ -n "$SSL_PATH" ]; then
XDEFINES="$XDEFINES -DOPENSSL"
--- NEW FILE amap.spec ---
Name: amap
Version: 5.2
Release: 4%{?dist}
Summary: Network tool for application protocol detection
Group: Applications/System
License: AMAP License
#License AMAP non-commercial rules added to GPLv2
URL: http://freeworld.thc.org/thc-amap/
Source0: http://freeworld.thc.org/releases/%{name}-%{version}.tar.gz
Patch0: %{name}-destdir.patch
Patch1: %{name}-path.patch
Patch2: %{name}-ldflags.patch
Patch3: %{name}-new-homepage.patch
Patch4: %{name}-system-pcre.patch
Patch5: %{name}-optflags.patch
Patch6: %{name}-lnamap6.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: openssl-devel
BuildRequires: pcre-devel
%description
THC Amap is a next-generation tool for assisting network penetration testing.
It performs fast and reliable application protocol detection, independent
on the TCP/UDP port they are being bound to.
%prep
%setup -q
%patch0 -p1 -b .0destdir
%patch1 -p1 -b .1path
%patch2 -p1 -b .2ldflags
%patch3 -p1 -b .3homepage
%patch4 -p1 -b .4pcre
%patch5 -p1 -b .5optflags
%patch6 -p1 -b .6lnamap6
%build
#%%configure
./configure --prefix=%{_prefix} --libdir=%{_libdir}
OPT="$RPM_OPT_FLAGS" make %{?_smp_mflags}
%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}
%clean
rm -rf %{buildroot}
%files
%defattr(644,root,root,755)
%doc CHANGES README TODO LICENCE.AMAP LICENSE.GNU
%attr(755,root,root) %{_bindir}/*
%{_mandir}/man1/%{name}.1*
%{_datadir}/%{name}
%changelog
* Fri Mar 26 2010 Michal Ambroz <rebus at, seznam.cz> 5.2-4
- more flexible pcre cflags to build also on RHEL4
* Sun Mar 20 2010 Michal Ambroz <rebus at, seznam.cz> 5.2-3
- License changed to AMAP license to avoid confusion
- patch makefile to link to amap6 instead of copy
* Fri Jan 08 2010 Michal Ambroz <rebus at, seznam.cz> 5.2-2
- patched makefile & spec to honour RPM_OPT_FLAGS
- included verbatim copy of licenses
- RPM_OPT_FLAGS fixed build of debug package as well
- removed explicit dependency on openssl and pcre
* Tue Jan 05 2010 Michal Ambroz <rebus at, seznam.cz> 5.2-1
- Initial SPEC for Fedora 12 using SPEC and patches from PLD
- Original SPEC by luzik qboosh zbyniu baggins glen
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/amap/F-13/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 25 Mar 2010 22:16:43 -0000 1.1
+++ .cvsignore 27 Mar 2010 00:42:35 -0000 1.2
@@ -0,0 +1 @@
+amap-5.2.tar.gz
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/amap/F-13/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 25 Mar 2010 22:16:43 -0000 1.1
+++ sources 27 Mar 2010 00:42:35 -0000 1.2
@@ -0,0 +1 @@
+e3b1f5ebd24aac03aacb38ec183eb426 amap-5.2.tar.gz
14 years, 1 month
- 1
- 0
rpms/amap/F-12 amap-destdir.patch, NONE, 1.1 amap-ldflags.patch, NONE, 1.1 amap-lnamap6.patch, NONE, 1.1 amap-new-homepage.patch, NONE, 1.1 amap-optflags.patch, NONE, 1.1 amap-path.patch, NONE, 1.1 amap-system-pcre.patch, NONE, 1.1 amap.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Michal Ambroz
Author: rebus
Update of /cvs/nonfree/rpms/amap/F-12
In directory se02.es.rpmfusion.net:/tmp/cvs-serv17159/F-12
Modified Files:
.cvsignore sources
Added Files:
amap-destdir.patch amap-ldflags.patch amap-lnamap6.patch
amap-new-homepage.patch amap-optflags.patch amap-path.patch
amap-system-pcre.patch amap.spec
Log Message:
Initial import of amap to branch F-12
amap-destdir.patch:
Makefile.am | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
--- NEW FILE amap-destdir.patch ---
diff -urN amap-5.2/Makefile.am amap-5.2.new/Makefile.am
--- amap-5.2/Makefile.am 2005-09-22 17:39:18.000000000 +0200
+++ amap-5.2.new/Makefile.am 2008-09-18 18:14:01.000000000 +0200
@@ -34,15 +34,15 @@
$(CC) $(OPT_DEBUG) -o amapcrap amapcrap.c $(XLIBS) $(XLIBPATHS) $(XIPATHS) $(XDEFINES)
install: all
- @echo Installing to $(PREFIX), change this by running ./configure --prefix=path
- -mkdir -vp $(PREFIX)$(BINDIR) 2> /dev/null
- -mkdir -vp $(PREFIX)$(DATADIR) 2> /dev/null
- -mkdir -vp $(PREFIX)$(MANDIR) 2> /dev/null
- -test -e amap.exe || cp -f amap amap6 amapcrap $(PREFIX)$(BINDIR)
- -test -e amap.exe && cp -f amap.exe amapcrap.exe $(PREFIX)$(BINDIR) || echo
- -cp -f $(SCRIPTS) $(PREFIX)$(DATADIR)
- -cp -f $(MANPAGE) $(PREFIX)$(MANDIR)
- -test $(PREFIX)$(BINDIR)/amap6 || cd $(PREFIX)$(BINDIR) && ln -s amap amap6
+ @echo Installing to $(DESTDIR)$(PREFIX), change this by running ./configure --prefix=path
+ -mkdir -vp $(DESTDIR)$(PREFIX)$(BINDIR) 2> /dev/null
+ -mkdir -vp $(DESTDIR)$(PREFIX)$(DATADIR) 2> /dev/null
+ -mkdir -vp $(DESTDIR)$(PREFIX)$(MANDIR) 2> /dev/null
+ -test -e amap.exe || cp -f amap amap6 amapcrap $(DESTDIR)$(PREFIX)$(BINDIR)
+ -test -e amap.exe && cp -f amap.exe amapcrap.exe $(DESTDIR)$(PREFIX)$(BINDIR) || echo
+ -cp -f $(SCRIPTS) $(DESTDIR)$(PREFIX)$(DATADIR)
+ -cp -f $(MANPAGE) $(DESTDIR)$(PREFIX)$(MANDIR)
+ -test $(DESTDIR)$(PREFIX)$(BINDIR)/amap6 || cd $(DESTDIR)$(PREFIX)$(BINDIR) && ln -s amap amap6
clean:
cd pcre-3.9 && make clean
amap-ldflags.patch:
Makefile.am | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE amap-ldflags.patch ---
diff -urN amap-5.2/Makefile.am amap-5.2.new/Makefile.am
--- amap-5.2/Makefile.am 2005-09-22 17:39:18.000000000 +0200
+++ amap-5.2.new/Makefile.am 2008-09-18 18:42:52.000000000 +0200
@@ -17,11 +17,11 @@
amap: amap-lib.o amap.c
@echo
- $(CC) $(OPT) -o amap amap.c amap-lib.o $(LIB) $(XLIBS) $(XLIBPATHS) $(XIPATHS) $(XDEFINES)
+ $(CC) $(OPT) $(LDFLAGS) -o amap amap.c amap-lib.o $(LIB) $(XLIBS) $(XLIBPATHS) $(XIPATHS) $(XDEFINES)
test -e amap6 -o -e amap6.lnk || ln -s amap amap6
amapcrap: amapcrap.c
- $(CC) $(OPT) -o amapcrap amapcrap.c $(XLIBS) $(XLIBPATHS) $(XIPATHS) $(XDEFINES)
+ $(CC) $(OPT) $(LDFLAGS) -o amapcrap amapcrap.c $(XLIBS) $(XLIBPATHS) $(XIPATHS) $(XDEFINES)
@echo
strip: amap amapcrap
amap-lnamap6.patch:
Makefile.am | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE amap-lnamap6.patch ---
diff -ru amap-5.2.orig/Makefile.am amap-5.2/Makefile.am
--- amap-5.2.orig/Makefile.am 2010-03-21 14:32:23.000000000 +0100
+++ amap-5.2/Makefile.am 2010-03-21 15:56:37.000000000 +0100
@@ -38,11 +38,11 @@
-mkdir -vp $(DESTDIR)$(PREFIX)$(BINDIR) 2> /dev/null
-mkdir -vp $(DESTDIR)$(PREFIX)$(DATADIR) 2> /dev/null
-mkdir -vp $(DESTDIR)$(PREFIX)$(MANDIR) 2> /dev/null
- -test -e amap.exe || cp -f amap amap6 amapcrap $(DESTDIR)$(PREFIX)$(BINDIR)
+ -test -e amap.exe || cp -f amap amapcrap $(DESTDIR)$(PREFIX)$(BINDIR)
-test -e amap.exe && cp -f amap.exe amapcrap.exe $(DESTDIR)$(PREFIX)$(BINDIR) || echo
-cp -f $(SCRIPTS) $(DESTDIR)$(PREFIX)$(DATADIR)
-cp -f $(MANPAGE) $(DESTDIR)$(PREFIX)$(MANDIR)
- -test $(DESTDIR)$(PREFIX)$(BINDIR)/amap6 || cd $(DESTDIR)$(PREFIX)$(BINDIR) && ln -s amap amap6
+ -test -e $(DESTDIR)$(PREFIX)$(BINDIR)/amap6 || ln -s amap $(DESTDIR)$(PREFIX)$(BINDIR)/amap6
clean:
cd pcre-3.9 && make clean
amap-new-homepage.patch:
amap.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE amap-new-homepage.patch ---
diff -urN amap-5.2/amap.h amap-5.2.new/amap.h
--- amap-5.2/amap.h 2005-09-08 00:08:57.000000000 +0200
+++ amap-5.2.new/amap.h 2008-09-18 18:52:31.000000000 +0200
@@ -22,7 +22,7 @@
#define AMAP_YEAR "2005"
#define AMAP_AUTHOR "van Hauser"
#define AMAP_EMAIL "amap-dev(a)thc.org"
-#define AMAP_RESOURCE "www.thc.org/thc-amap"
+#define AMAP_RESOURCE "freeworld.thc.org/thc-amap"
#ifndef AMAP_PREFIX
#ifdef PREFIX
amap-optflags.patch:
Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE amap-optflags.patch ---
diff -ru amap-5.2/Makefile.am amap-5.2.orig/Makefile.am
--- amap-5.2/Makefile.am 2010-01-08 11:23:46.000000000 +0100
+++ amap-5.2.orig/Makefile.am 2010-01-08 11:23:31.000000000 +0100
@@ -1,6 +1,6 @@
CC=gcc
LIB=-lpcre
-OPT=-O2
+OPT+=-O2
OPT_DEBUG=-ggdb -Wall -lefence
BINDIR=/bin
DATADIR=/share/amap
amap-path.patch:
Makefile.am | 4 ++--
amap-lib.c | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
--- NEW FILE amap-path.patch ---
diff -urN amap-5.2/amap-lib.c amap-5.2.new/amap-lib.c
--- amap-5.2/amap-lib.c 2005-09-07 23:22:24.000000000 +0200
+++ amap-5.2.new/amap-lib.c 2008-09-18 18:29:01.000000000 +0200
@@ -306,7 +306,7 @@
strcpy(file_name, AMAP_PREFIX);
if (file_name[strlen(file_name) - 1] != '/')
strcat(file_name, "/");
- strcat(file_name, "etc/");
+ strcat(file_name, "share/amap/");
strcat(file_name, AMAP_DEFAULT_FILENAME);
strcat(file_name, extension);
f = fopen(file_name, "r");
@@ -2032,9 +2032,9 @@
if (opt->update) {
printf("Running Online Update for fingerprints, connecting to %s\n", AMAP_RESOURCE);
if (opt->filename == NULL) {
- opt->filename = malloc(strlen(AMAP_PREFIX) + 5 + strlen(AMAP_DEFAULT_FILENAME) + 2);
+ opt->filename = malloc(strlen(AMAP_PREFIX) + 12 + strlen(AMAP_DEFAULT_FILENAME) + 2);
strcpy(opt->filename, AMAP_PREFIX);
- strcat(opt->filename, "/etc/");
+ strcat(opt->filename, "/share/amap/");
strcat(opt->filename, AMAP_DEFAULT_FILENAME);
}
opt->file_log = malloc(strlen(opt->filename) + 6);
diff -urN amap-5.2/Makefile.am amap-5.2.new/Makefile.am
--- amap-5.2/Makefile.am 2005-09-22 17:39:18.000000000 +0200
+++ amap-5.2.new/Makefile.am 2008-09-18 18:32:07.000000000 +0200
@@ -3,8 +3,8 @@
OPT=-O2
OPT_DEBUG=-ggdb -Wall -lefence
BINDIR=/bin
-DATADIR=/etc
-MANDIR=/man/man1
+DATADIR=/share/amap
+MANDIR=/share/man/man1
SCRIPTS=appdefs.trig appdefs.resp appdefs.rpc
MANPAGE=amap.1
all: pcre strip
amap-system-pcre.patch:
amap-5.2.new/Makefile.am | 4 ++--
amap-5.2.new/amap-inc.h | 2 +-
amap-5.2/configure | 10 ++++------
3 files changed, 7 insertions(+), 9 deletions(-)
--- NEW FILE amap-system-pcre.patch ---
diff -urN amap-5.2/amap-inc.h amap-5.2.new/amap-inc.h
--- amap-5.2/amap-inc.h 2003-10-29 23:37:41.000000000 +0100
+++ amap-5.2.new/amap-inc.h 2008-09-18 18:54:40.000000000 +0200
@@ -20,7 +20,7 @@
#include <errno.h>
#include <sys/resource.h>
#include <sys/wait.h>
-#include "pcre-3.9/pcre.h"
+#include <pcre.h>
#ifdef OPENSSL
#include <openssl/ssl.h>
#include <openssl/err.h>
diff -urN amap-5.2/Makefile.am amap-5.2.new/Makefile.am
--- amap-5.2/Makefile.am 2005-09-22 17:39:18.000000000 +0200
+++ amap-5.2.new/Makefile.am 2008-09-18 18:55:34.000000000 +0200
@@ -1,5 +1,5 @@
CC=gcc
-LIB=-lpcre -L./pcre-3.9/ -I./pcre-3.9/
+LIB=-lpcre
OPT=-O2
OPT_DEBUG=-ggdb -Wall -lefence
BINDIR=/bin
@@ -8,6 +8,6 @@
SCRIPTS=appdefs.trig appdefs.resp appdefs.rpc
MANPAGE=amap.1
-all: pcre strip
+all: amap amapcrap
pcre:
cd pcre-3.9 && make
diff -ru amap-5.2.orig/configure amap-5.2/configure
--- amap-5.2.orig/configure 2010-03-21 14:32:23.000000000 +0100
+++ amap-5.2/configure 2010-03-26 19:02:49.000000000 +0100
@@ -13,15 +13,13 @@
exit 0
fi
-cd pcre-3.9 || exit 1
-./configure || exit 1
-cd ..
-
echo
echo
echo "Starting amap auto configuration ..."
rm -f Makefile.in
PREFIX=""
+PCRE_LIBS=`pcre-config --libs`
+PCRE_IPATH=`pcre-config --cflags`
SSL_PATH=""
SSL_IPATH=""
CRYPTO_PATH=""
@@ -123,9 +121,9 @@
echo
XDEFINES=""
-XLIBS=""
+XLIBS="$PCRE_LIBS"
XLIBPATHS=""
-XIPATHS=""
+XIPATHS="$PCRE_IPATH"
if [ -n "$SSL_PATH" ]; then
XDEFINES="$XDEFINES -DOPENSSL"
--- NEW FILE amap.spec ---
Name: amap
Version: 5.2
Release: 4%{?dist}
Summary: Network tool for application protocol detection
Group: Applications/System
License: AMAP License
#License AMAP non-commercial rules added to GPLv2
URL: http://freeworld.thc.org/thc-amap/
Source0: http://freeworld.thc.org/releases/%{name}-%{version}.tar.gz
Patch0: %{name}-destdir.patch
Patch1: %{name}-path.patch
Patch2: %{name}-ldflags.patch
Patch3: %{name}-new-homepage.patch
Patch4: %{name}-system-pcre.patch
Patch5: %{name}-optflags.patch
Patch6: %{name}-lnamap6.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: openssl-devel
BuildRequires: pcre-devel
%description
THC Amap is a next-generation tool for assisting network penetration testing.
It performs fast and reliable application protocol detection, independent
on the TCP/UDP port they are being bound to.
%prep
%setup -q
%patch0 -p1 -b .0destdir
%patch1 -p1 -b .1path
%patch2 -p1 -b .2ldflags
%patch3 -p1 -b .3homepage
%patch4 -p1 -b .4pcre
%patch5 -p1 -b .5optflags
%patch6 -p1 -b .6lnamap6
%build
#%%configure
./configure --prefix=%{_prefix} --libdir=%{_libdir}
OPT="$RPM_OPT_FLAGS" make %{?_smp_mflags}
%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}
%clean
rm -rf %{buildroot}
%files
%defattr(644,root,root,755)
%doc CHANGES README TODO LICENCE.AMAP LICENSE.GNU
%attr(755,root,root) %{_bindir}/*
%{_mandir}/man1/%{name}.1*
%{_datadir}/%{name}
%changelog
* Fri Mar 26 2010 Michal Ambroz <rebus at, seznam.cz> 5.2-4
- more flexible pcre cflags to build also on RHEL4
* Sun Mar 20 2010 Michal Ambroz <rebus at, seznam.cz> 5.2-3
- License changed to AMAP license to avoid confusion
- patch makefile to link to amap6 instead of copy
* Fri Jan 08 2010 Michal Ambroz <rebus at, seznam.cz> 5.2-2
- patched makefile & spec to honour RPM_OPT_FLAGS
- included verbatim copy of licenses
- RPM_OPT_FLAGS fixed build of debug package as well
- removed explicit dependency on openssl and pcre
* Tue Jan 05 2010 Michal Ambroz <rebus at, seznam.cz> 5.2-1
- Initial SPEC for Fedora 12 using SPEC and patches from PLD
- Original SPEC by luzik qboosh zbyniu baggins glen
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/amap/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 25 Mar 2010 22:16:43 -0000 1.1
+++ .cvsignore 27 Mar 2010 00:41:28 -0000 1.2
@@ -0,0 +1 @@
+amap-5.2.tar.gz
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/amap/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 25 Mar 2010 22:16:43 -0000 1.1
+++ sources 27 Mar 2010 00:41:28 -0000 1.2
@@ -0,0 +1 @@
+e3b1f5ebd24aac03aacb38ec183eb426 amap-5.2.tar.gz
14 years, 1 month
- 1
- 0
rpms/xbmc/F-13 xbmc-9.11-Makefile.include.in.diff, NONE, 1.1 xbmc-9.11-RandomNumberGenerators.hpp.diff, NONE, 1.1 xbmc-9.11-Weather.diff, NONE, 1.1 xbmc-9.11-XBMCProjectM-cmake.diff, NONE, 1.1 xbmc-9.11-b1-dvdlibs-external.patch, NONE, 1.1 xbmc-9.11-cflags.patch, NONE, 1.1 xbmc-9.11-changeset-26191.diff, NONE, 1.1 xbmc-9.11-configure.patch, NONE, 1.1 xbmc-9.11-external-zlib.diff, NONE, 1.1 xbmc-9.11-fix-Makefile.in.patch, NONE, 1.1 xbmc-9.11-goom-missing.diff, NONE, 1.1 xbmc-9.11-gymcodec.patch, NONE, 1.1 x
by Alex Lancaster
Author: alexlan
Update of /cvs/free/rpms/xbmc/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv15625/F-13
Modified Files:
.cvsignore sources
Added Files:
xbmc-9.11-Makefile.include.in.diff
xbmc-9.11-RandomNumberGenerators.hpp.diff
xbmc-9.11-Weather.diff xbmc-9.11-XBMCProjectM-cmake.diff
xbmc-9.11-b1-dvdlibs-external.patch xbmc-9.11-cflags.patch
xbmc-9.11-changeset-26191.diff xbmc-9.11-configure.patch
xbmc-9.11-external-zlib.diff xbmc-9.11-fix-Makefile.in.patch
xbmc-9.11-goom-missing.diff xbmc-9.11-gymcodec.patch
xbmc-9.11-hdhomerun.patch xbmc-9.11-libdca.patch
xbmc-9.11-libid3tag.patch xbmc-9.11-librtv.patch
xbmc-9.11-macdll.patch xbmc-9.11-maclib.patch
xbmc-9.11-remlibass.patch xbmc-9.11-remove-goahead.patch
xbmc-9.11-rsxs-0.9.diff xbmc-9.11-spyce.diff
xbmc-9.11-swscale.diff
xbmc-9.11-use_cdio_system_headers_on_non_win32.patch
xbmc-9.11-xbmc.sh.diff xbmc-9.11-xext.diff
xbmc-generate-tarball-xz.sh xbmc.spec
Log Message:
Initial import.
xbmc-9.11-Makefile.include.in.diff:
Makefile.include.in | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
--- NEW FILE xbmc-9.11-Makefile.include.in.diff ---
diff -Naur xbmc-9.11.orig/Makefile.include.in xbmc-9.11/Makefile.include.in
--- xbmc-9.11.orig/Makefile.include.in 2009-11-14 04:53:41.000000000 +0100
+++ xbmc-9.11/Makefile.include.in 2009-12-30 08:39:41.000000000 +0100
@@ -5,6 +5,8 @@
ARCH=@ARCH@
abs_top_srcdir=@abs_top_srcdir@
prefix=@prefix@
+bindir=@bindir@
+libdir=@libdir@
CXX=@CXX@
CC=@CC@
CXXFLAGS+=@CXXFLAGS@
@@ -18,7 +20,7 @@
-D_REENTRANT \
-D_LARGEFILE64_SOURCE \
-D_FILE_OFFSET_BITS=64 \
- -DINSTALL_PATH="\"@prefix@/share/xbmc\"" \
+ -DINSTALL_PATH="\"@libdir@/xbmc\"" \
@SDL_DEFINES@ \
@ARCH_DEFINES@ \
@DEFS@ \
xbmc-9.11-RandomNumberGenerators.hpp.diff:
RandomNumberGenerators.hpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE xbmc-9.11-RandomNumberGenerators.hpp.diff ---
diff -Naur xbmc-9.11.orig/xbmc/visualizations/XBMCProjectM/libprojectM/RandomNumberGenerators.hpp xbmc-9.11/xbmc/visualizations/XBMCProjectM/libprojectM/RandomNumberGenerators.hpp
--- xbmc-9.11.orig/xbmc/visualizations/XBMCProjectM/libprojectM/RandomNumberGenerators.hpp 2008-07-18 06:54:03.000000000 +0200
+++ xbmc-9.11/xbmc/visualizations/XBMCProjectM/libprojectM/RandomNumberGenerators.hpp 2009-12-31 11:57:53.000000000 +0100
@@ -85,7 +85,7 @@
// Sum up mass, stopping when cutoff is reached. This is the typical
// weighted sampling algorithm.
float mass = 0;
- for (std::size_t i = 0; i< weights.size() ; i) {
+ for (std::size_t i = 0; i< weights.size() ; i++) {
mass += weights[i];
if (mass >= cutoff)
return i;
xbmc-9.11-Weather.diff:
Weather.cpp | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
--- NEW FILE xbmc-9.11-Weather.diff ---
diff -Naur xbmc-9.11-8.2/xbmc/utils/Weather.cpp xbmc-9.11-8.3/xbmc/utils/Weather.cpp
--- xbmc-9.11-8.2/xbmc/utils/Weather.cpp 2009-11-12 08:41:55.000000000 +0100
+++ xbmc-9.11-8.3/xbmc/utils/Weather.cpp 2010-01-22 10:56:40.000000000 +0100
@@ -399,7 +399,7 @@
GetString(pOneDayElement, "low", iTmpStr, "");
if (iTmpStr == "N/A")
- m_info.forecast[i].m_high = "";
+ m_info.forecast[i].m_low = "";
else
{
CTemperature temp=CTemperature::CreateFromCelsius(atoi(iTmpStr));
@@ -417,8 +417,12 @@
m_info.forecast[i].m_icon.Format("%s128x128/na.png", WEATHER_BASE_PATH);
else
m_info.forecast[i].m_icon.Format("%s128x128/%s.png", WEATHER_BASE_PATH, iTmpStr);
-
- GetString(pDayTimeElement, "t", m_info.forecast[i].m_overview, "");
+
+ GetString(pDayTimeElement, "t", iTmpStr, ""); //string cause i've seen it return N/A
+ if (iTmpStr == "N/A")
+ m_info.forecast[i].m_overview = "";
+ else
+ m_info.forecast[i].m_overview = iTmpStr;
LocalizeOverview(m_info.forecast[i].m_overview);
}
xbmc-9.11-XBMCProjectM-cmake.diff:
configure.in | 8 +++++++-
xbmc/visualizations/XBMCProjectM/libprojectM/CMakeLists.txt | 2 +-
2 files changed, 8 insertions(+), 2 deletions(-)
--- NEW FILE xbmc-9.11-XBMCProjectM-cmake.diff ---
diff -Naur xbmc-9.11-8.4/configure.in xbmc-9.11-8.5/configure.in
--- xbmc-9.11-8.4/configure.in 2010-01-24 06:05:15.000000000 +0100
+++ xbmc-9.11-8.5/configure.in 2010-01-24 06:41:46.000000000 +0100
@@ -1329,7 +1329,13 @@
if test "$host_vendor" = "apple" ; then
rm -f CMakeCache.txt && CC="" CXX="" cmake -D CMAKE_C_FLAGS:STRING="-fno-common" -D CMAKE_CXX_FLAGS:STRING="-fno-common" -D CMAKE_BUILD_TYPE:STRING=RelWithDebInfo -D USE_FTGL:BOOL=OFF .
else
- rm -f CMakeCache.txt && CC="" CXX="" cmake -D CMAKE_BUILD_TYPE:STRING=RelWithDebInfo -D USE_FTGL:BOOL=OFF .
+set -x
+ rm -f CMakeCache.txt && cmake -DCMAKE_BUILD_TYPE=None -DUSE_FTGL:BOOL=OFF \
+ -DCMAKE_C_FLAGS="${CFLAGS}" -DCMAKE_CXX_FLAGS="${CXXFLAGS}" \
+ -DCMAKE_INSTALL_PREFIX="${prefix}" -DCMAKE_INSTALL_LIBDIR:PATH="${libdir}" \
+ -DINCLUDE_INSTALL_DIR:PATH="${includedir}" -DLIB_INSTALL_DIR:PATH="${_libdir}" \
+ -DSYSCONF_INSTALL_DIR:PATH="${sysconfdir}" -DSHARE_INSTALL_PREFIX:PATH="${datadir}" .
+set +x
fi
], [0])
diff -Naur xbmc-9.11-8.4/xbmc/visualizations/XBMCProjectM/libprojectM/CMakeLists.txt xbmc-9.11-8.5/xbmc/visualizations/XBMCProjectM/libprojectM/CMakeLists.txt
--- xbmc-9.11-8.4/xbmc/visualizations/XBMCProjectM/libprojectM/CMakeLists.txt 2009-12-08 04:05:05.000000000 +0100
+++ xbmc-9.11-8.5/xbmc/visualizations/XBMCProjectM/libprojectM/CMakeLists.txt 2010-01-24 06:41:46.000000000 +0100
@@ -116,7 +116,7 @@
ENDIF(FTGL_FOUND)
# todo: change this because its obscure and probably not being used
- set (FTGL_INCLUDE_DIRS "/opt/local/include")
+# set (FTGL_INCLUDE_DIRS "/opt/local/include")
set (FTGL_LINK_DIRS)
set (FTGL_LINK_TARGETS )
ENDIF(USE_FTGL)
xbmc-9.11-b1-dvdlibs-external.patch:
configure.in | 64 -------------------------
xbmc/cores/dvdplayer/Codecs/libdvd/Makefile.in | 9 +--
2 files changed, 5 insertions(+), 68 deletions(-)
--- NEW FILE xbmc-9.11-b1-dvdlibs-external.patch ---
--- xbmc-9.11-b1/configure.in.dvdlibs 2009-12-01 23:00:27.689755837 +0100
+++ xbmc-9.11-b1/configure.in 2009-12-01 23:13:34.449759740 +0100
@@ -37,8 +37,6 @@
pulse_disabled="== PulseAudio support manually disabled. =="
faac_not_found="== Could not find libfaac. FAAC support disabled. =="
faac_disabled="== FAAC support manually disabled. =="
-dvdcss_enabled="== DVDCSS support enabled. =="
-dvdcss_disabled="== DVDCSS support disabled. =="
avahi_not_found="== Could not find libavahi-common or libavahi-client. Avahi support disabled. =="
avahi_disabled="== Avahi support disabled. =="
vdpau_not_found="== Could not find libvdpau. VDPAU support disabled. =="
@@ -160,12 +158,6 @@
[use_faac=$enableval],
[use_faac=yes])
-AC_ARG_ENABLE([dvdcss],
- [AS_HELP_STRING([--enable-dvdcss],
- [enable DVDCSS support (default is yes)])],
- [use_dvdcss=$enableval],
- [use_dvdcss=yes])
-
AC_ARG_ENABLE([mid],
[AS_HELP_STRING([--enable-mid],
[enable MID support (default is no)])],
@@ -871,20 +863,6 @@
final_message="$final_message\n FAAC:\t\tNo"
fi
-# DVDCSS
-if test "$use_dvdcss" = "yes"; then
- AC_MSG_NOTICE($dvdcss_enabled)
- final_message="$final_message\n DVDCSS:\tYes"
- BUILD_DVDCSS=1
- SKIP_CONFIG_DVDCSS=0
- DVDREAD_CFLAGS="-D_XBMC -DHAVE_DVDCSS_DVDCSS_H"
-else
- AC_MSG_NOTICE($dvdcss_disabled)
- final_message="$final_message\n DVDCSS:\tNo"
- BUILD_DVDCSS=0
- SKIP_CONFIG_DVDCSS=1
- DVDREAD_CFLAGS="-D_XBMC -UHAVE_DVDCSS_DVDCSS_H"
-fi
if test "$use_avahi" = "yes"; then
final_message="$final_message\n Avahi:\tYes"
else
@@ -1214,44 +1192,6 @@
fi
], [$USE_EXTERNAL_LIBDTS])
-XB_CONFIG_MODULE([xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss], [
- if test "$host_vendor" = "apple" ; then
- ./configure MACOSX_DEPLOYMENT_TARGET=10.4 \
- CFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" \
- --disable-doc \
- --enable-static \
- --with-pic
- else
- ./configure \
- --disable-doc \
- --enable-static \
- --with-pic
- fi
-], [$SKIP_CONFIG_DVDCSS])
-
-XB_CONFIG_MODULE([xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread], [
- if test "$host_vendor" = "apple" ; then
- ./configure2 MACOSX_DEPLOYMENT_TARGET=10.4 \
- --extra-cflags="$DVDREAD_CFLAGS -D__DARWIN__ -fPIC -DPIC -fno-common -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4 -I`pwd`/../libdvdcss/src" \
- --enable-static \
- --disable-shared \
- --cc="$CC" &&
- make dvdread-config &&
- mkdir -p `pwd`/../includes/dvdread
- cp `pwd`/../libdvdread/src/*.h `pwd`/../includes/dvdread
- else
- ./configure2 \
- --extra-cflags="$DVDREAD_CFLAGS -fPIC -DPIC -I`pwd`/../libdvdcss/src" \
- --enable-static \
- --disable-shared \
- --cc="$CC" &&
- make dvdread-config &&
- mkdir -p `pwd`/../includes/dvdread
- cp `pwd`/../libdvdread/src/*.h `pwd`/../includes/dvdread
- fi
-
-], [0])
-
XB_CONFIG_MODULE([xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav], [
if test "$host_vendor" = "apple" ; then
./configure2 MACOSX_DEPLOYMENT_TARGET=10.4 \
@@ -1263,9 +1203,7 @@
--cc="$CC"
else
./configure2 \
- --extra-cflags="$DVDREAD_CFLAGS -fPIC -DPIC -I`pwd`/../includes" \
- --extra-ldflags="-L`pwd`/../libdvdread/obj" \
- --with-dvdread-config="`pwd`/../libdvdread/obj/dvdread-config" \
+ --extra-cflags="-D_XBMC -fPIC -DPIC" \
--enable-static \
--disable-shared \
--cc="$CC"
--- xbmc-9.11-b1/xbmc/cores/dvdplayer/Codecs/libdvd/Makefile.in.dvdlibs 2009-07-10 01:10:10.000000000 +0200
+++ xbmc-9.11-b1/xbmc/cores/dvdplayer/Codecs/libdvd/Makefile.in 2009-12-02 23:15:36.942762083 +0100
@@ -2,13 +2,12 @@
ARCH=@ARCH@
SYSDIR=../../../../../system/players/dvdplayer
SOS= libdvdnav-$(ARCH).so
-DIRS= libdvdread \
- libdvdnav
+DIRS= libdvdnav
WRAPPER=../../../DllLoader/exports/wrapper.o
WRAPPER_OSX=../../../../../tools/Mach5/wrapper.rb
-LDFLAGS=-shared -fPIC -rdynamic
+LDFLAGS=-shared -fPIC -rdynamic -ldvdread
ifeq ($(ARCH), powerpc-osx)
# Add -lbundle1.o for powerpc-osx
BUNDLE1_O = -lbundle1.o
@@ -53,8 +52,8 @@
libdvdcss/src/*.o \
`cat $(WRAPPER:.o=.def)` $(WRAPPER)
-$(SYSDIR)/libdvdnav-$(ARCH).so: $(WRAPPER) $(DVDCSS_A) libdvdread/obj/libdvdread.a libdvdnav/obj/libdvdnav.a
- $(CC) -o $@ $(LDFLAGS) --soname,$@ $(DVDCSS_O) libdvdread/obj/*.o libdvdnav/obj/*.o \
+$(SYSDIR)/libdvdnav-$(ARCH).so: $(WRAPPER) $(DVDCSS_A) libdvdnav/obj/libdvdnav.a
+ $(CC) -o $@ $(LDFLAGS) --soname,$@ $(DVDCSS_O) libdvdnav/obj/*.o \
`cat $(WRAPPER:.o=.def)` $(WRAPPER)
endif
xbmc-9.11-cflags.patch:
tools/TexturePacker/Makefile.in | 2 +-
xbmc/cores/dvdplayer/Codecs/libdvd/Makefile.in | 4 ++--
xbmc/cores/paplayer/AC3Codec/Makefile.in | 4 ++--
xbmc/cores/paplayer/ADPCMCodec/Makefile.in | 6 +++---
xbmc/cores/paplayer/FLACCodec/Makefile.in | 4 ++--
xbmc/cores/paplayer/GYMCodec/Makefile.in | 2 +-
xbmc/cores/paplayer/MACDll/Makefile.in | 2 +-
xbmc/cores/paplayer/ModuleCodec/Makefile.in | 2 +-
xbmc/cores/paplayer/NSFCodec/Makefile.in | 2 +-
xbmc/cores/paplayer/SIDCodec/Makefile.in | 2 +-
xbmc/cores/paplayer/SPCCodec/SNES/SNESAPU/Makefile.in | 6 +++---
xbmc/cores/paplayer/WavPackCodec/Makefile.in | 2 +-
xbmc/cores/paplayer/YMCodec/StSoundLibrary/Makefile.in | 2 +-
xbmc/cores/paplayer/timidity/Makefile.in | 4 ++--
xbmc/cores/paplayer/vgmstream/Makefile.in | 4 ++--
xbmc/cores/paplayer/vorbisfile/Makefile.in | 2 +-
xbmc/lib/libid3tag/Makefile.in | 2 +-
xbmc/visualizations/Goom/Makefile.in | 2 +-
xbmc/visualizations/XBMCProjectM/Makefile.in | 4 ++--
19 files changed, 29 insertions(+), 29 deletions(-)
--- NEW FILE xbmc-9.11-cflags.patch ---
diff -Naur xbmc-9.11-10.0/tools/TexturePacker/Makefile.in xbmc-9.11-10.1/tools/TexturePacker/Makefile.in
--- xbmc-9.11-10.0/tools/TexturePacker/Makefile.in 2009-10-04 05:55:21.000000000 +0200
+++ xbmc-9.11-10.1/tools/TexturePacker/Makefile.in 2010-01-26 05:14:09.000000000 +0100
@@ -21,4 +21,4 @@
include ../../Makefile.include
$(TARGET): $(OBJS)
- $(CXX) $(OBJS) $(LDFLAGS) $(LIBS) -o $(TARGET)
+ $(CXX) $(CXXFLAGS) $(OBJS) $(LDFLAGS) $(LIBS) -o $(TARGET)
diff -Naur xbmc-9.11-10.0/xbmc/cores/dvdplayer/Codecs/libdvd/Makefile.in xbmc-9.11-10.1/xbmc/cores/dvdplayer/Codecs/libdvd/Makefile.in
--- xbmc-9.11-10.0/xbmc/cores/dvdplayer/Codecs/libdvd/Makefile.in 2010-01-25 14:29:23.000000000 +0100
+++ xbmc-9.11-10.1/xbmc/cores/dvdplayer/Codecs/libdvd/Makefile.in 2010-01-26 05:14:09.000000000 +0100
@@ -48,12 +48,12 @@
else
$(SYSDIR)/libdvdcss-$(ARCH).so: $(WRAPPER) libdvdcss/src/.libs/libdvdcss.a
- $(CC) -o $@ $(LDFLAGS) --soname,$@ \
+ $(CC) $(CFLAGS) -o $@ $(LDFLAGS) --soname,$@ \
libdvdcss/src/*.o \
`cat $(WRAPPER:.o=.def)` $(WRAPPER)
$(SYSDIR)/libdvdnav-$(ARCH).so: $(WRAPPER) $(DVDCSS_A) libdvdnav/obj/libdvdnav.a
- $(CC) -o $@ $(LDFLAGS) --soname,$@ $(DVDCSS_O) libdvdnav/obj/*.o \
+ $(CC) $(CFLAGS) -o $@ $(LDFLAGS) --soname,$@ $(DVDCSS_O) libdvdnav/obj/*.o \
`cat $(WRAPPER:.o=.def)` $(WRAPPER)
endif
diff -Naur xbmc-9.11-10.0/xbmc/cores/paplayer/AC3Codec/Makefile.in xbmc-9.11-10.1/xbmc/cores/paplayer/AC3Codec/Makefile.in
--- xbmc-9.11-10.0/xbmc/cores/paplayer/AC3Codec/Makefile.in 2009-09-03 11:42:46.000000000 +0200
+++ xbmc-9.11-10.1/xbmc/cores/paplayer/AC3Codec/Makefile.in 2010-01-26 05:14:09.000000000 +0100
@@ -1,5 +1,5 @@
ARCH=@ARCH@
-CFLAGS=-D_LINUX -fPIC -Iinclude -Ivc++
+CFLAGS=-D_LINUX -fPIC -Iinclude
ifeq ($(findstring osx,$(ARCH)), osx)
export MACOSX_DEPLOYMENT_TARGET=10.4
CFLAGS+=-fno-common -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4
@@ -20,7 +20,7 @@
../../../../tools/Mach5/wrapper.rb $@;mv output.so $@
chmod +x $@
else
- $(CC) -fPIC -shared -o $@ $(OBJS) \
+ $(CC) $(CFLAGS) -shared -o $@ $(OBJS) \
`cat ../../DllLoader/exports/wrapper.def` ../../DllLoader/exports/wrapper.o
endif
diff -Naur xbmc-9.11-10.0/xbmc/cores/paplayer/ADPCMCodec/Makefile.in xbmc-9.11-10.1/xbmc/cores/paplayer/ADPCMCodec/Makefile.in
--- xbmc-9.11-10.0/xbmc/cores/paplayer/ADPCMCodec/Makefile.in 2009-03-22 19:56:49.000000000 +0100
+++ xbmc-9.11-10.1/xbmc/cores/paplayer/ADPCMCodec/Makefile.in 2010-01-26 05:14:09.000000000 +0100
@@ -1,7 +1,7 @@
ARCH=@ARCH@
OBJS=uXboxAdpcmDecoder.o ADPCMDll.o
-CFLAGS +=-D_LINUX -fPIC -O2
-CXXFLAGS += -D_LINUX -fPIC -O2
+CFLAGS +=-D_LINUX -fPIC
+CXXFLAGS += -D_LINUX -fPIC
SLIB=../../../../system/players/paplayer/adpcm-@ARCH@.so
@@ -11,7 +11,7 @@
../../../../tools/Mach5/wrapper.rb $@;mv output.so $@
chmod +x $@
else
- $(CC) -shared -o $@ *.o `cat ../../DllLoader/exports/wrapper.def` ../../DllLoader/exports/wrapper.o
+ $(CC) $(CFLAGS) -shared -o $@ *.o `cat ../../DllLoader/exports/wrapper.def` ../../DllLoader/exports/wrapper.o
endif
include ../../../../Makefile.include
diff -Naur xbmc-9.11-10.0/xbmc/cores/paplayer/FLACCodec/Makefile.in xbmc-9.11-10.1/xbmc/cores/paplayer/FLACCodec/Makefile.in
--- xbmc-9.11-10.0/xbmc/cores/paplayer/FLACCodec/Makefile.in 2009-10-07 10:28:05.000000000 +0200
+++ xbmc-9.11-10.1/xbmc/cores/paplayer/FLACCodec/Makefile.in 2010-01-26 05:14:09.000000000 +0100
@@ -19,12 +19,12 @@
else
ifneq (@USE_EXTERNAL_LIBFLAC@,1)
$(FLAC_LIB): flac-1.2.1/src/libFLAC/.libs/libFLAC.a
- $(CC) -shared -fpic -o $@ -rdynamic \
+ $(CC) $(CFLAGS) -shared -fpic -o $@ -rdynamic \
-Wl,--whole-archive flac-1.2.1/src/libFLAC/.libs/libFLAC.a -Wl,--no-whole-archive \
`cat ../../DllLoader/exports/wrapper.def` ../../DllLoader/exports/wrapper.o
else
$(FLAC_LIB):
- $(CC) -shared -fpic -o $@ -rdynamic -lFLAC \
+ $(CC) $(CFLAGS) -shared -fpic -o $@ -rdynamic -lFLAC \
`cat ../../DllLoader/exports/wrapper.def` ../../DllLoader/exports/wrapper.o
endif
endif
diff -Naur xbmc-9.11-10.0/xbmc/cores/paplayer/GYMCodec/Makefile.in xbmc-9.11-10.1/xbmc/cores/paplayer/GYMCodec/Makefile.in
--- xbmc-9.11-10.0/xbmc/cores/paplayer/GYMCodec/Makefile.in 2009-09-03 11:42:46.000000000 +0200
+++ xbmc-9.11-10.1/xbmc/cores/paplayer/GYMCodec/Makefile.in 2010-01-26 05:14:09.000000000 +0100
@@ -15,7 +15,7 @@
../../../../tools/Mach5/wrapper.rb $@;mv output.so $@
chmod +x $@
else
- $(CXX) -shared -o $@ *.o `cat ../../DllLoader/exports/wrapper.def` ../../DllLoader/exports/wrapper.o
+ $(CXX) $(CXXFLAGS) -shared -o $@ *.o `cat ../../DllLoader/exports/wrapper.def` ../../DllLoader/exports/wrapper.o
endif
diff -Naur xbmc-9.11-10.0/xbmc/cores/paplayer/MACDll/Makefile.in xbmc-9.11-10.1/xbmc/cores/paplayer/MACDll/Makefile.in
--- xbmc-9.11-10.0/xbmc/cores/paplayer/MACDll/Makefile.in 2009-10-07 10:28:05.000000000 +0200
+++ xbmc-9.11-10.1/xbmc/cores/paplayer/MACDll/Makefile.in 2010-01-26 05:14:09.000000000 +0100
@@ -65,7 +65,7 @@
../../../../tools/Mach5/wrapper.rb $@;mv output.so $@
chmod +x $@
else
- $(CC) -fPIC -shared -o $@ $(OBJS) \
+ $(CC) $(CFLAGS) -shared -o $@ $(OBJS) \
`cat ../../DllLoader/exports/wrapper.def` ../../DllLoader/exports/wrapper.o
endif
diff -Naur xbmc-9.11-10.0/xbmc/cores/paplayer/ModuleCodec/Makefile.in xbmc-9.11-10.1/xbmc/cores/paplayer/ModuleCodec/Makefile.in
--- xbmc-9.11-10.0/xbmc/cores/paplayer/ModuleCodec/Makefile.in 2009-11-08 02:23:56.000000000 +0100
+++ xbmc-9.11-10.1/xbmc/cores/paplayer/ModuleCodec/Makefile.in 2010-01-26 05:14:09.000000000 +0100
@@ -17,7 +17,7 @@
chmod +x $@
else
- $(CXX) -fPIC -shared -o $@ $(OBJS) -Wl,--whole-archive dumb/lib/unix/libdumb.a \
+ $(CXX) $(CXXFLAGS) -shared -o $@ $(OBJS) -Wl,--whole-archive dumb/lib/unix/libdumb.a \
-Wl,--no-whole-archive `cat ../../DllLoader/exports/wrapper.def` \
../../DllLoader/exports/wrapper.o
diff -Naur xbmc-9.11-10.0/xbmc/cores/paplayer/NSFCodec/Makefile.in xbmc-9.11-10.1/xbmc/cores/paplayer/NSFCodec/Makefile.in
--- xbmc-9.11-10.0/xbmc/cores/paplayer/NSFCodec/Makefile.in 2009-09-03 11:42:46.000000000 +0200
+++ xbmc-9.11-10.1/xbmc/cores/paplayer/NSFCodec/Makefile.in 2010-01-26 05:14:09.000000000 +0100
@@ -20,7 +20,7 @@
../../../../tools/Mach5/wrapper.rb $@;mv output.so $@
chmod +x $@
else
- $(CC) -fPIC -shared -o $@ $(OBJS) `cat ../../DllLoader/exports/wrapper.def` ../../DllLoader/exports/wrapper.o
+ $(CC) $(CFLAGS) -shared -o $@ $(OBJS) `cat ../../DllLoader/exports/wrapper.def` ../../DllLoader/exports/wrapper.o
endif
include ../../../../Makefile.include
diff -Naur xbmc-9.11-10.0/xbmc/cores/paplayer/SIDCodec/Makefile.in xbmc-9.11-10.1/xbmc/cores/paplayer/SIDCodec/Makefile.in
--- xbmc-9.11-10.0/xbmc/cores/paplayer/SIDCodec/Makefile.in 2009-09-03 11:42:46.000000000 +0200
+++ xbmc-9.11-10.1/xbmc/cores/paplayer/SIDCodec/Makefile.in 2010-01-26 05:14:09.000000000 +0100
@@ -17,7 +17,7 @@
../../../../tools/Mach5/wrapper.rb $@;mv output.so $@
chmod +x $@
else
- $(CC) -fPIC -shared -o $@ $(OBJS) ../../../linux/XHandle.o `cat ../../DllLoader/exports/wrapper.def` ../../DllLoader/exports/wrapper.o
+ $(CC) $(CFLAGS) -shared -o $@ $(OBJS) ../../../linux/XHandle.o `cat ../../DllLoader/exports/wrapper.def` ../../DllLoader/exports/wrapper.o
endif
include ../../../../Makefile.include
diff -Naur xbmc-9.11-10.0/xbmc/cores/paplayer/SPCCodec/SNES/SNESAPU/Makefile.in xbmc-9.11-10.1/xbmc/cores/paplayer/SPCCodec/SNES/SNESAPU/Makefile.in
--- xbmc-9.11-10.0/xbmc/cores/paplayer/SPCCodec/SNES/SNESAPU/Makefile.in 2009-03-22 19:56:49.000000000 +0100
+++ xbmc-9.11-10.1/xbmc/cores/paplayer/SPCCodec/SNES/SNESAPU/Makefile.in 2010-01-26 05:14:09.000000000 +0100
@@ -1,8 +1,8 @@
ARCH=@ARCH@
AS=nasm
OBJS=SPC700.o APU.o DSP.o SNESAPU.o
-CFLAGS +=-D_LINUX -fPIC -I../../ -O2
-CXXFLAGS +=-D_LINUX -fPIC -I../../ -O2
+CFLAGS +=-D_LINUX -fPIC -I../..
+CXXFLAGS +=-D_LINUX -fPIC -I../..
ifeq ($(findstring osx,$(ARCH)), osx)
CFLAGS+=-fno-common
CXXFLAGS+=-fno-common
@@ -25,7 +25,7 @@
../../../../../../tools/Mach5/wrapper.rb $@;mv output.so $@
chmod +x $@
else
- $(CC) -shared -o $@ $(OBJS) \
+ $(CC) $(CFLAGS) -shared -o $@ $(OBJS) \
`cat ../../../../DllLoader/exports/wrapper.def` ../../../../DllLoader/exports/wrapper.o
endif
diff -Naur xbmc-9.11-10.0/xbmc/cores/paplayer/timidity/Makefile.in xbmc-9.11-10.1/xbmc/cores/paplayer/timidity/Makefile.in
--- xbmc-9.11-10.0/xbmc/cores/paplayer/timidity/Makefile.in 2009-09-03 11:42:46.000000000 +0200
+++ xbmc-9.11-10.1/xbmc/cores/paplayer/timidity/Makefile.in 2010-01-26 05:14:09.000000000 +0100
@@ -1,6 +1,6 @@
ARCH=@ARCH@
-CFLAGS+=-D_LINUX -fPIC -O2 -DHAVE_GETTIMEOFDAY -I. -Itimidity -Ilibarc -Iutils
+CFLAGS+=-D_LINUX -fPIC -DHAVE_GETTIMEOFDAY -I. -Itimidity -Ilibarc -Iutils
ifeq ($(ARCH), powerpc-osx)
BUNDLE1_O=-lbundle1.o -L/usr/lib/gcc/powerpc-apple-darwin8/4.0.1/ -lgcc
endif
@@ -57,7 +57,7 @@
../../../../tools/Mach5/wrapper.rb $@;mv output.so $@
chmod +x $@
else
- $(CXX) -shared -o $@ $(OBJS) `cat ../../DllLoader/exports/wrapper.def` ../../DllLoader/exports/wrapper.o -Wl,--version-script=exports.def
+ $(CXX) $(CXXFLAGS) -shared -o $@ $(OBJS) `cat ../../DllLoader/exports/wrapper.def` ../../DllLoader/exports/wrapper.o -Wl,--version-script=exports.def
endif
include ../../../../Makefile.include
diff -Naur xbmc-9.11-10.0/xbmc/cores/paplayer/vgmstream/Makefile.in xbmc-9.11-10.1/xbmc/cores/paplayer/vgmstream/Makefile.in
--- xbmc-9.11-10.0/xbmc/cores/paplayer/vgmstream/Makefile.in 2009-03-23 00:27:25.000000000 +0100
+++ xbmc-9.11-10.1/xbmc/cores/paplayer/vgmstream/Makefile.in 2010-01-26 05:14:09.000000000 +0100
@@ -4,8 +4,8 @@
CFLAGS +=-D_LINUX -fPIC -DPIC -O3 -DXBMC
CXXFLAGS +=-D_LINUX -fPIC -DPIC -O3 -DXBMC
else
- CFLAGS +=-D_LINUX -fPIC -DPIC -O3 -fno-stack-protector -DXBMC
- CXXFLAGS +=-D_LINUX -fPIC -DPIC -O3 -fno-stack-protector -DXBMC
+ CFLAGS +=-D_LINUX -fPIC -DXBMC
+ CXXFLAGS +=-D_LINUX -fPIC -DXBMC
endif
CODING_OBJS=src/coding/acm_decoder.o \
diff -Naur xbmc-9.11-10.0/xbmc/cores/paplayer/vorbisfile/Makefile.in xbmc-9.11-10.1/xbmc/cores/paplayer/vorbisfile/Makefile.in
--- xbmc-9.11-10.0/xbmc/cores/paplayer/vorbisfile/Makefile.in 2009-09-03 11:42:46.000000000 +0200
+++ xbmc-9.11-10.1/xbmc/cores/paplayer/vorbisfile/Makefile.in 2010-01-26 05:14:09.000000000 +0100
@@ -33,7 +33,7 @@
../../../../tools/Mach5/wrapper.rb $@;mv output.so $@
chmod +x $@
else
- $(CC) -shared -o $@ $(VORBIS_LINK_OPTS) $(OGG_LINK_OPTS) \
+ $(CC) $(CFLAGS) -shared -o $@ $(VORBIS_LINK_OPTS) $(OGG_LINK_OPTS) \
`cat ../../DllLoader/exports/wrapper.def` \
../../DllLoader/exports/wrapper.o
endif
diff -Naur xbmc-9.11-10.0/xbmc/cores/paplayer/WavPackCodec/Makefile.in xbmc-9.11-10.1/xbmc/cores/paplayer/WavPackCodec/Makefile.in
--- xbmc-9.11-10.0/xbmc/cores/paplayer/WavPackCodec/Makefile.in 2009-09-03 11:42:46.000000000 +0200
+++ xbmc-9.11-10.1/xbmc/cores/paplayer/WavPackCodec/Makefile.in 2010-01-26 05:14:09.000000000 +0100
@@ -14,7 +14,7 @@
../../../../tools/Mach5/wrapper.rb $@;mv output.so $@
chmod +x $@
else
- $(CC) -fPIC -shared -o $@ $(OBJS) `cat ../../DllLoader/exports/wrapper.def` ../../DllLoader/exports/wrapper.o
+ $(CC) $(CFLAGS) -shared -o $@ $(OBJS) `cat ../../DllLoader/exports/wrapper.def` ../../DllLoader/exports/wrapper.o
endif
include ../../../../Makefile.include
diff -Naur xbmc-9.11-10.0/xbmc/cores/paplayer/YMCodec/StSoundLibrary/Makefile.in xbmc-9.11-10.1/xbmc/cores/paplayer/YMCodec/StSoundLibrary/Makefile.in
--- xbmc-9.11-10.0/xbmc/cores/paplayer/YMCodec/StSoundLibrary/Makefile.in 2009-09-03 11:42:46.000000000 +0200
+++ xbmc-9.11-10.1/xbmc/cores/paplayer/YMCodec/StSoundLibrary/Makefile.in 2010-01-26 05:14:09.000000000 +0100
@@ -17,7 +17,7 @@
../../../../../tools/Mach5/wrapper.rb $@;mv output.so $@
chmod +x $@
else
- $(CC) -fPIC -shared -o $@ $(OBJS) `cat ../../../DllLoader/exports/wrapper.def` ../../../DllLoader/exports/wrapper.o
+ $(CC) $(CFLAGS) -shared -o $@ $(OBJS) `cat ../../../DllLoader/exports/wrapper.def` ../../../DllLoader/exports/wrapper.o
endif
include ../../../../../Makefile.include
diff -Naur xbmc-9.11-10.0/xbmc/lib/libid3tag/Makefile.in xbmc-9.11-10.1/xbmc/lib/libid3tag/Makefile.in
--- xbmc-9.11-10.0/xbmc/lib/libid3tag/Makefile.in 2009-10-07 10:28:05.000000000 +0200
+++ xbmc-9.11-10.1/xbmc/lib/libid3tag/Makefile.in 2010-01-26 05:14:09.000000000 +0100
@@ -16,7 +16,7 @@
chmod +x $@
else
$(SLIB): libid3tag/.libs/libid3tag.so
- $(CXX) -shared -fPIC -O3 -o $@ libid3tag/.libs/*.o \
+ $(CXX) $(CXXFLAGS) -shared -fPIC -o $@ libid3tag/.libs/*.o \
`cat ../../cores/DllLoader/exports/wrapper.def` \
../../cores/DllLoader/exports/wrapper.o
endif
diff -Naur xbmc-9.11-10.0/xbmc/visualizations/Goom/Makefile.in xbmc-9.11-10.1/xbmc/visualizations/Goom/Makefile.in
--- xbmc-9.11-10.0/xbmc/visualizations/Goom/Makefile.in 2009-03-23 01:04:05.000000000 +0100
+++ xbmc-9.11-10.1/xbmc/visualizations/Goom/Makefile.in 2010-01-26 05:14:09.000000000 +0100
@@ -2,7 +2,7 @@
INCLUDES=-I. -I.. -I../../linux -I../../ -I../../../guilib -I../../../visualisations -Igoom2k4-0/src
OBJS=Main.o
SLIB=../../../visualisations/Goom.vis
-CXXFLAGS=-g -O3 -fPIC
+CXXFLAGS=-fPIC
DIRS=goom2k4-0
$(SLIB): $(OBJS) goom2k4-0/src/.libs/libgoom2.a
diff -Naur xbmc-9.11-10.0/xbmc/visualizations/XBMCProjectM/Makefile.in xbmc-9.11-10.1/xbmc/visualizations/XBMCProjectM/Makefile.in
--- xbmc-9.11-10.0/xbmc/visualizations/XBMCProjectM/Makefile.in 2009-07-09 02:00:27.000000000 +0200
+++ xbmc-9.11-10.1/xbmc/visualizations/XBMCProjectM/Makefile.in 2010-01-26 05:14:09.000000000 +0100
@@ -2,7 +2,7 @@
INCLUDES=-I. -I.. -I../../linux -I../../ -I../../../guilib -I../../../visualisations
OBJS=Main.o
SLIB=../../../visualisations/ProjectM.vis
-CXXFLAGS=-O3 -g -fPIC
+CXXFLAGS=-fPIC
DIRS=libprojectM
ifeq ($(findstring osx,$(ARCH)), osx)
@@ -18,7 +18,7 @@
$(MAKE) -C libprojectM
else
$(SLIB): $(OBJS) libprojectM/libprojectM.so
- $(CXX) ./libprojectM/CMakeFiles/projectM.dir/*.o -fPIC -shared $(CFLAGS) -o $(SLIB) $(OBJS) `cat ../../cores/DllLoader/exports/wrapper.def` ../../cores/DllLoader/exports/wrapper.o
+ $(CXX) $(CXXFLAGS) ./libprojectM/CMakeFiles/projectM.dir/*.o -fPIC -shared -o $(SLIB) $(OBJS) `cat ../../cores/DllLoader/exports/wrapper.def` ../../cores/DllLoader/exports/wrapper.o
libprojectM/libprojectM.so:
$(MAKE) -C libprojectM
xbmc-9.11-changeset-26191.diff:
lib/cximage-6.0/CxImage/DllInterface.cpp | 1 -
lib/libUPnP/Neptune/Source/Core/NptUtils.h | 2 +-
lib/libUPnP/Neptune/Source/System/StdC/NptStdCTime.cpp | 4 ++--
linux/NetworkLinux.cpp | 1 +
4 files changed, 4 insertions(+), 4 deletions(-)
--- NEW FILE xbmc-9.11-changeset-26191.diff ---
diff -Naur xbmc-9.11.orig/xbmc/lib/cximage-6.0/CxImage/DllInterface.cpp xbmc-9.11/xbmc/lib/cximage-6.0/CxImage/DllInterface.cpp
--- xbmc-9.11.orig/xbmc/lib/cximage-6.0/CxImage/DllInterface.cpp 2009-10-24 06:12:27.000000000 +0200
+++ xbmc-9.11/xbmc/lib/cximage-6.0/CxImage/DllInterface.cpp 2010-01-02 10:49:17.000000000 +0100
@@ -188,7 +188,6 @@
int ResampleKeepAspectArea(CxImage &image, unsigned int area)
{
- bool bResize = false;
float fAspect = ((float)image.GetWidth()) / ((float)image.GetHeight());
unsigned int width = (unsigned int)sqrt(area * fAspect);
unsigned int height = (unsigned int)sqrt(area / fAspect);
diff -Naur xbmc-9.11.orig/xbmc/linux/NetworkLinux.cpp xbmc-9.11/xbmc/linux/NetworkLinux.cpp
--- xbmc-9.11.orig/xbmc/linux/NetworkLinux.cpp 2009-11-20 05:52:25.000000000 +0100
+++ xbmc-9.11/xbmc/linux/NetworkLinux.cpp 2010-01-03 05:25:29.000000000 +0100
@@ -636,6 +636,7 @@
if (!fw)
{
// TODO
+ fclose(fr);
return;
}
diff -Naur xbmc-9.11.orig/xbmc/lib/libUPnP/Neptune/Source/Core/NptUtils.h xbmc-9.11/xbmc/lib/libUPnP/Neptune/Source/Core/NptUtils.h
--- xbmc-9.11.orig/xbmc/lib/libUPnP/Neptune/Source/Core/NptUtils.h 2009-07-06 10:12:52.000000000 +0200
+++ xbmc-9.11/xbmc/lib/libUPnP/Neptune/Source/Core/NptUtils.h 2010-01-02 08:26:18.000000000 +0100
@@ -205,7 +205,7 @@
#endif
#if defined(NPT_CONFIG_HAVE_MEMSET)
-#define NPT_SetMemory memset
+#define NPT_SetMemory(dest, c, s) memset(dest, c, s)
#else
extern void NPT_SetMemory(void* dest, int c, NPT_Size size);
#endif
diff -Naur xbmc-9.11.orig/xbmc/lib/libUPnP/Neptune/Source/System/StdC/NptStdCTime.cpp xbmc-9.11/xbmc/lib/libUPnP/Neptune/Source/System/StdC/NptStdCTime.cpp
--- xbmc-9.11.orig/xbmc/lib/libUPnP/Neptune/Source/System/StdC/NptStdCTime.cpp 2009-10-10 12:22:06.000000000 +0200
+++ xbmc-9.11/xbmc/lib/libUPnP/Neptune/Source/System/StdC/NptStdCTime.cpp 2010-01-02 08:26:48.000000000 +0100
@@ -90,7 +90,7 @@
time_t ltime;
struct tm gmt;
- NPT_SetMemory(&gmt, sizeof(gmt), 0);
+ NPT_SetMemory(&gmt, 0, sizeof(gmt));
ltime = (time_t) time.m_Seconds;
int result = gmtime_s(&gmt, <ime);
@@ -112,7 +112,7 @@
time_t ltime;
struct tm local;
- NPT_SetMemory(&local, sizeof(local), 0);
+ NPT_SetMemory(&local, 0, sizeof(local));
/* get the current time stamp */
NPT_CHECK_SEVERE(NPT_System::GetCurrentTimeStamp(now));
xbmc-9.11-configure.patch:
configure.in | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
--- NEW FILE xbmc-9.11-configure.patch ---
diff -Naur xbmc-9.11-11.0/configure.in xbmc-9.11-11.1/configure.in
--- xbmc-9.11-11.0/configure.in 2010-02-03 07:34:17.000000000 +0100
+++ xbmc-9.11-11.1/configure.in 2010-02-03 07:33:21.000000000 +0100
@@ -1217,9 +1217,12 @@
--cc="$CC"
else
./configure2 \
- --extra-cflags="-D_XBMC -fPIC -DPIC" \
+ --prefix="${prefix}" --includedir="${includedir}" --libdir="${libdir}" --datadir="${datadir}" \
+ --extra-cflags="$CFLAGS -D_XBMC -fPIC -DPIC" \
--enable-static \
--disable-shared \
+ --disable-strip \
+ --disable-opts \
--cc="$CC"
fi
], [0])
@@ -1317,10 +1320,12 @@
--disable-debugging \
--with-pic
else
- CFLAGS=-O3 \
./configure \
+ CPPFLAGS="$CPPFLAGS" \
+ CFLAGS="$CFLAGS -fPIC" \
+ CXXFLAGS="$CXXFLAGS -fPIC" \
+ --prefix="${prefix}" --includedir="${includedir}" --libdir="${libdir}" --datadir="${datadir}" \
--disable-static \
- --disable-debugging \
--with-pic
fi
], [0])
@@ -1333,7 +1338,7 @@
rm -f CMakeCache.txt && cmake -DCMAKE_BUILD_TYPE=None -DUSE_FTGL:BOOL=OFF \
-DCMAKE_C_FLAGS="${CFLAGS}" -DCMAKE_CXX_FLAGS="${CXXFLAGS}" \
-DCMAKE_INSTALL_PREFIX="${prefix}" -DCMAKE_INSTALL_LIBDIR:PATH="${libdir}" \
- -DINCLUDE_INSTALL_DIR:PATH="${includedir}" -DLIB_INSTALL_DIR:PATH="${_libdir}" \
+ -DINCLUDE_INSTALL_DIR:PATH="${includedir}" -DLIB_INSTALL_DIR:PATH="${libdir}" \
-DSYSCONF_INSTALL_DIR:PATH="${sysconfdir}" -DSHARE_INSTALL_PREFIX:PATH="${datadir}" .
set +x
fi
@@ -1342,10 +1347,13 @@
XB_CONFIG_MODULE([xbmc/visualizations/Goom/goom2k4-0],[
if test "$host_vendor" != "apple" ; then
./configure \
+ CPPFLAGS="$CPPFLAGS" \
+ CFLAGS="$CFLAGS -fPIC" \
+ CXXFLAGS="$CXXFLAGS -fPIC" \
+ --prefix="${prefix}" --includedir="${includedir}" --libdir="${libdir}" --datadir="${datadir}" \
--disable-shared \
--enable-static \
--with-pic
-
fi
], [$BUILD_GOOM])
xbmc-9.11-external-zlib.diff:
configure.in | 22 +++++++++++++++++++++-
xbmc/FileSystem/FileZip.h | 2 +-
xbmc/FileSystem/ZipDirectory.cpp | 2 +-
3 files changed, 23 insertions(+), 3 deletions(-)
--- NEW FILE xbmc-9.11-external-zlib.diff ---
diff -Naur xbmc-9.11-8/configure.in xbmc-9.11/configure.in
--- xbmc-9.11-8/configure.in 2010-01-21 14:04:04.000000000 +0100
+++ xbmc-9.11/configure.in 2010-01-21 18:58:26.000000000 +0100
@@ -59,6 +59,8 @@
external_libogg_disabled="== Use of external libogg disabled. =="
external_libwavpack_enabled="== Use of external libwavpack enabled. =="
external_libwavpack_disabled="== Use of external libwavpack disabled. =="
+external_libz_enabled="== Use of external libz enabled. =="
+external_libz_disabled="== Use of external libz disabled. =="
external_python_enabled="== Use of external python enabled. =="
external_python_disabled="== Use of external python disabled. =="
ffmpeg_vdpau_not_supported="== External ffmpeg doesn't support VDPAU. VDPAU support disabled. =="
@@ -223,6 +225,12 @@
[use_external_libwavpack=$enableval],
[use_external_libwavpack=no])
+AC_ARG_ENABLE([external-libz],
+ [AS_HELP_STRING([--enable-external-libz],
+ [enable use of external libz library (default is no)])],
+ [use_external_libz=$enableval],
+ [use_external_libz=no])
+
AC_ARG_ENABLE([external-python],
[AS_HELP_STRING([--enable-external-python],
[enable use of external python library (default is no) 'Linux only'])],
@@ -611,6 +619,18 @@
USE_EXTERNAL_LIBWAVPACK=0
fi
+# External libz
+if test "$use_external_libraries" = "yes" || test "$use_external_libz" = "yes"; then
+ AC_CHECK_LIB([z], [main],, AC_MSG_ERROR($missing_library))
+ AC_CHECK_HEADERS([zlib.h],, AC_MSG_ERROR([$missing_headers]))
+ AC_MSG_NOTICE($external_libz_enabled)
+ USE_EXTERNAL_LIBZ=1
+ AC_DEFINE([USE_EXTERNAL_LIBZ], [1], [Whether to use external libz library/zlib.])
+else
+ AC_MSG_NOTICE($external_libz_disabled)
+ USE_EXTERNAL_LIBZ=0
+fi
+
# External Python
if test "$use_external_libraries" = "yes" || test "$use_external_python" = "yes"; then
AC_CHECK_LIB([python2.6], [main],,
@@ -1276,7 +1296,7 @@
CFLAGS="-fPIC -fno-common -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" \
./configure
fi
-], [0])
+], [$USE_EXTERNAL_LIBZ])
XB_CONFIG_MODULE([xbmc/lib/libass], [
if test "$host_vendor" = "apple" ; then
diff -Naur xbmc-9.11-8/xbmc/FileSystem/FileZip.h xbmc-9.11/xbmc/FileSystem/FileZip.h
--- xbmc-9.11-8/xbmc/FileSystem/FileZip.h 2009-09-23 05:50:54.000000000 +0200
+++ xbmc-9.11/xbmc/FileSystem/FileZip.h 2010-01-21 16:48:18.000000000 +0100
@@ -23,7 +23,7 @@
#include "IFile.h"
-#include "lib/zlib/zlib.h"
+#include <zlib.h>
#include "utils/log.h"
#include "GUIWindowManager.h"
#include "FileSystem/File.h"
diff -Naur xbmc-9.11-8/xbmc/FileSystem/ZipDirectory.cpp xbmc-9.11/xbmc/FileSystem/ZipDirectory.cpp
--- xbmc-9.11-8/xbmc/FileSystem/ZipDirectory.cpp 2009-10-14 00:53:03.000000000 +0200
+++ xbmc-9.11/xbmc/FileSystem/ZipDirectory.cpp 2010-01-21 16:48:18.000000000 +0100
@@ -23,7 +23,7 @@
#include "utils/log.h"
#include "utils/CharsetConverter.h"
#include "Util.h"
-#include "lib/zlib/zlib.h"
+#include <zlib.h>
#include "URL.h"
#include "ZipManager.h"
#include "FileItem.h"
xbmc-9.11-fix-Makefile.in.patch:
Makefile.in | 58 +++++++++++++++++++++++++++-------------------------------
1 file changed, 27 insertions(+), 31 deletions(-)
--- NEW FILE xbmc-9.11-fix-Makefile.in.patch ---
--- Makefile.in.orig 2009-12-31 18:35:33.201505454 -0500
+++ Makefile.in 2009-12-31 18:36:29.747380027 -0500
@@ -416,7 +416,7 @@
$(MAKE) -C tools/TexturePacker/
install-bin: xbmc.bin # developement convenience target
- sudo install -D xbmc.bin $(prefix)/share/xbmc
+ sudo install -D xbmc.bin $(DESTDIR)$(libdir)/xbmc
ifeq ($(findstring osx,$(ARCH)), osx)
# TODO: add osx install
@@ -424,55 +424,51 @@
install: install-binaries install-arch install-datas install-web
install-binaries: install-scripts
- @echo "Copying XBMC binary to $(prefix)/share/xbmc/xbmc.bin"
- @install -D xbmc.bin $(prefix)/share/xbmc/xbmc.bin
- @install -D xbmc-xrandr $(prefix)/share/xbmc/xbmc-xrandr
+ @echo "Copying XBMC binary to $(DESTDIR)$(libdir)/xbmc/xbmc.bin"
+ @install -D xbmc.bin $(DESTDIR)$(libdir)/xbmc/xbmc.bin
+ @install -D xbmc-xrandr $(DESTDIR)$(libdir)/xbmc/xbmc-xrandr
@echo "You can run XBMC with the command 'xbmc'"
endif
install-arch:
- @# Arch dependent files
- @find system screensavers visualisations -regextype posix-extended -type f -not -iregex ".*svn.*|.*win32(dx)?\.vis|.*osx\.vis" -iregex ".*$(ARCH).*|.*\.vis|.*\.xbs" -exec install -D "{}" $(prefix)/share/xbmc/"{}" \; -printf " -- %-75.75f\r"
+ @find system screensavers visualisations -regextype posix-extended -type f -not -iregex ".*svn.*|.*win32(dx)?\.vis|.*osx\.vis" -iregex ".*$(ARCH).*|.*\.vis|.*\.xbs" -exec install -D "{}" $(DESTDIR)$(libdir)/xbmc/"{}" \; -printf " -- %-75.75f\r"
install-scripts:
- @install -D tools/Linux/xbmc.sh $(prefix)/bin/xbmc
- @install -D tools/Linux/xbmc-standalone.sh $(prefix)/bin/xbmc-standalone
- @install -D -m 0644 tools/Linux/FEH.py $(prefix)/share/xbmc/FEH.py
- @install -D -m 0644 tools/Linux/xbmc-xsession.desktop $(prefix)/share/xsessions/XBMC.desktop
+ @install -D tools/Linux/xbmc.sh $(DESTDIR)$(bindir)/xbmc
+ @install -D tools/Linux/xbmc-standalone.sh $(DESTDIR)$(bindir)/xbmc-standalone
+ @install -D -m 0644 tools/Linux/FEH.py $(DESTDIR)$(libdir)/xbmc/FEH.py
+ @install -D -m 0644 tools/Linux/xbmc-xsession.desktop $(DESTDIR)$(prefix)/share/xsessions/XBMC.desktop
install-datas: install-scripts
@echo "Copying support and legal files..."
@for FILE in `ls README.linux LICENSE.GPL *.txt`; do \
- install -D -m 0644 "$$FILE" $(prefix)/share/xbmc/; done
+ install -D -m 0644 "$$FILE" $(DESTDIR)$(libdir)/xbmc/; done
@echo "Done!"
- @echo "Copying system files to $(prefix)/share/xbmc"
- @# Arch independent files
- @find language media scripts sounds userdata visualisations system -regextype posix-extended -type f -not -iregex ".*svn.*|.*\.so|.*\.dll|.*\.pyd|.*python/.*\.zlib|.*\.vis" -exec install -D -m 0644 "{}" $(prefix)/share/xbmc/"{}" \; -printf " -- %-75.75f\r"
- @# Skins
- @find skin -regextype posix-extended -type f -not -iregex '.*/\.svn/.*|^skin/[^/]*/media/.*[^x][^b][^t]' -exec install -D -m 0644 '{}' $(prefix)/share/xbmc/'{}' \; -printf " -- %-75.75f\r"
- @# Icons and links
- @mkdir -p $(prefix)/share/applications $(prefix)/share/pixmaps
- @cp -a tools/Linux/xbmc.png $(prefix)/share/pixmaps/
- @cp -a tools/Linux/xbmc.desktop $(prefix)/share/applications/
+ @echo "Copying system files to $(DESTDIR)$(libdir)/xbmc"
+ @find language media scripts sounds userdata visualisations system -regextype posix-extended -type f -not -iregex ".*svn.*|.*\.so|.*\.dll|.*\.pyd|.*python/.*\.zlib|.*\.vis" -exec install -D -m 0644 "{}" $(DESTDIR)$(libdir)/xbmc/"{}" \; -printf " -- %-75.75f\r"
+ @find skin -regextype posix-extended -type f -not -iregex '.*/\.svn/.*|^skin/[^/]*/media/.*[^x][^b][^t]' -exec install -D -m 0644 '{}' $(DESTDIR)$(libdir)/xbmc/'{}' \; -printf " -- %-75.75f\r"
+ @mkdir -p $(DESTDIR)$(prefix)/share/applications $(DESTDIR)$(prefix)/share/pixmaps
+ @cp -a tools/Linux/xbmc.png $(DESTDIR)$(prefix)/share/pixmaps/
+ @cp -a tools/Linux/xbmc.desktop $(DESTDIR)$(prefix)/share/applications/
install-livedatas:
@echo "Install Live CD datas in $(prefix) ..."
- @mkdir -p $(prefix)/bin
- @install -D tools/XBMCLive/diskmounter $(prefix)/bin
- @install -D tools/XBMCLive/installXBMC $(prefix)/bin
- @install -D tools/XBMCLive/runXBMC $(prefix)/bin
- @install -D tools/XBMCLive/setAlsaVolumes $(prefix)/bin
+ @mkdir -p $(DESTDIR)$(bindir)
+ @install -D tools/XBMCLive/diskmounter $(DESTDIR)$(bindir)
+ @install -D tools/XBMCLive/installXBMC $(DESTDIR)$(bindir)
+ @install -D tools/XBMCLive/runXBMC $(DESTDIR)$(bindir)
+ @install -D tools/XBMCLive/setAlsaVolumes $(DESTDIR)$(bindir)
install-web:
- @mkdir -p $(prefix)/share/xbmc/web
- @cp -r web/Project_Mayhem_III/* $(prefix)/share/xbmc/web
- @find $(prefix)/share/xbmc/web -depth -name .svn -exec rm -rf {} \;
+ @mkdir -p $(DESTDIR)$(libdir)/xbmc/web
+ @cp -r web/Project_Mayhem_III/* $(DESTDIR)$(libdir)/xbmc/web
+ @find $(DESTDIR)$(libdir)/xbmc/web -depth -name .svn -exec rm -rf {} \;
uninstall:
@echo "Removing XBMC..."
- @rm -rf $(prefix)/share/xbmc $(prefix)/bin/xbmc
- @rm -rf $(prefix)/bin/xbmc-standalone
- @rm -rf $(prefix)/share/xsessions/XBMC.desktop
+ @rm -rf $(DESTDIR)$(libdir)/xbmc $(DESTDIR)$(bindir)/xbmc
+ @rm -rf $(DESTDIR)$(bindir)/xbmc-standalone
+ @rm -rf $(DESTDIR)$(prefix)/share/xsessions/XBMC.desktop
@echo "Done!"
reallyclean:
xbmc-9.11-goom-missing.diff:
missing | 274 +++++++++++++++++++++++++++++++++++++++++++++++++++++-----------
1 file changed, 230 insertions(+), 44 deletions(-)
--- NEW FILE xbmc-9.11-goom-missing.diff ---
diff -Naur xbmc-9.11.orig/xbmc/visualizations/Goom/goom2k4-0/missing xbmc-9.11/xbmc/visualizations/Goom/goom2k4-0/missing
--- xbmc-9.11.orig/xbmc/visualizations/Goom/goom2k4-0/missing 2009-08-31 22:54:54.000000000 +0200
+++ xbmc-9.11/xbmc/visualizations/Goom/goom2k4-0/missing 2010-01-02 06:09:10.000000000 +0100
@@ -1,7 +1,11 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-# Copyright (C) 1996, 1997 Free Software Foundation, Inc.
-# Franc,ois Pinard <pinard(a)iro.umontreal.ca>, 1996.
+
+scriptversion=2009-04-28.21; # UTC
+
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
+# 2008, 2009 Free Software Foundation, Inc.
+# Originally by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -14,16 +18,48 @@
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
if test $# -eq 0; then
echo 1>&2 "Try \`$0 --help' for more information"
exit 1
fi
-case "$1" in
+run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
+
+# In the cases where this matters, `missing' is being run in the
+# srcdir already.
+if test -f configure.ac; then
+ configure_ac=configure.ac
+else
+ configure_ac=configure.in
+fi
+
+msg="missing on your system"
+
+case $1 in
+--run)
+ # Try to run requested program, and just exit if it succeeds.
+ run=
+ shift
+ "$@" && exit 0
+ # Exit code 63 means version mismatch. This often happens
+ # when the user try to use an ancient version of a tool on
+ # a file that requires a minimum version. In this case we
+ # we should proceed has if the program had been absent, or
+ # if --run hadn't been passed.
+ if test $? = 63; then
+ run=:
+ msg="probably too old"
+ fi
+ ;;
-h|--h|--he|--hel|--help)
echo "\
@@ -35,21 +71,32 @@
Options:
-h, --help display this help and exit
-v, --version output version information and exit
+ --run try to run the given command, and emulate it if it fails
Supported PROGRAM values:
aclocal touch file \`aclocal.m4'
autoconf touch file \`configure'
autoheader touch file \`config.h.in'
+ autom4te touch the output file, or create a stub one
automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
+ help2man touch the output file
lex create \`lex.yy.c', if possible, from existing .c
makeinfo touch the output file
- yacc create \`y.tab.[ch]', if possible, from existing .[ch]"
+ tar try tar, gnutar, gtar, then tar without non-portable flags
+ yacc create \`y.tab.[ch]', if possible, from existing .[ch]
+
+Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
+\`g' are ignored when checking the name.
+
+Send bug reports to <bug-automake(a)gnu.org>."
+ exit $?
;;
-v|--v|--ve|--ver|--vers|--versi|--versio|--version)
- echo "missing - GNU libit 0.0"
+ echo "missing $scriptversion (GNU Automake)"
+ exit $?
;;
-*)
@@ -58,35 +105,77 @@
exit 1
;;
- aclocal)
+esac
+
+# normalize program name to check for.
+program=`echo "$1" | sed '
+ s/^gnu-//; t
+ s/^gnu//; t
+ s/^g//; t'`
+
+# Now exit if we have it, but it failed. Also exit now if we
+# don't have it and --version was passed (most likely to detect
+# the program). This is about non-GNU programs, so use $1 not
+# $program.
+case $1 in
+ lex*|yacc*)
+ # Not GNU programs, they don't have --version.
+ ;;
+
+ tar*)
+ if test -n "$run"; then
+ echo 1>&2 "ERROR: \`tar' requires --run"
+ exit 1
+ elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
+ exit 1
+ fi
+ ;;
+
+ *)
+ if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+ # We have it, but it failed.
+ exit 1
+ elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
+ # Could not run --version or --help. This is probably someone
+ # running `$TOOL --version' or `$TOOL --help' to check whether
+ # $TOOL exists and not knowing $TOOL uses missing.
+ exit 1
+ fi
+ ;;
+esac
+
+# If it does not exist, or fails to run (possibly an outdated version),
+# try to emulate it.
+case $program in
+ aclocal*)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
- you modified \`acinclude.m4' or \`configure.in'. You might want
+WARNING: \`$1' is $msg. You should only need it if
+ you modified \`acinclude.m4' or \`${configure_ac}'. You might want
to install the \`Automake' and \`Perl' packages. Grab them from
any GNU archive site."
touch aclocal.m4
;;
- autoconf)
+ autoconf*)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
- you modified \`configure.in'. You might want to install the
+WARNING: \`$1' is $msg. You should only need it if
+ you modified \`${configure_ac}'. You might want to install the
\`Autoconf' and \`GNU m4' packages. Grab them from any GNU
archive site."
touch configure
;;
- autoheader)
+ autoheader*)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
- you modified \`acconfig.h' or \`configure.in'. You might want
+WARNING: \`$1' is $msg. You should only need it if
+ you modified \`acconfig.h' or \`${configure_ac}'. You might want
to install the \`Autoconf' and \`GNU m4' packages. Grab them
from any GNU archive site."
- files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' configure.in`
+ files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
- case "$f" in
+ case $f in
*:*) touch_files="$touch_files "`echo "$f" |
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
*) touch_files="$touch_files $f.in";;
@@ -95,10 +184,10 @@
touch $touch_files
;;
- automake)
+ automake*)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
- you modified \`Makefile.am', \`acinclude.m4' or \`configure.in'.
+WARNING: \`$1' is $msg. You should only need it if
+ you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
You might want to install the \`Automake' and \`Perl' packages.
Grab them from any GNU archive site."
find . -type f -name Makefile.am -print |
@@ -106,81 +195,170 @@
while read f; do touch "$f"; done
;;
- bison|yacc)
+ autom4te*)
+ echo 1>&2 "\
+WARNING: \`$1' is needed, but is $msg.
+ You might have modified some files without having the
+ proper tools for further handling them.
+ You can get \`$1' as part of \`Autoconf' from any GNU
+ archive site."
+
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -f "$file"; then
+ touch $file
+ else
+ test -z "$file" || exec >$file
+ echo "#! /bin/sh"
+ echo "# Created by GNU Automake missing as a replacement of"
+ echo "# $ $@"
+ echo "exit 0"
+ chmod +x $file
+ exit 1
+ fi
+ ;;
+
+ bison*|yacc*)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' $msg. You should only need it if
you modified a \`.y' file. You may need the \`Bison' package
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
rm -f y.tab.c y.tab.h
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.c
fi
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.h
fi
;;
esac
fi
- if [ ! -f y.tab.h ]; then
+ if test ! -f y.tab.h; then
echo >y.tab.h
fi
- if [ ! -f y.tab.c ]; then
+ if test ! -f y.tab.c; then
echo 'main() { return 0; }' >y.tab.c
fi
;;
- lex|flex)
+ lex*|flex*)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified a \`.l' file. You may need the \`Flex' package
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
rm -f lex.yy.c
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" lex.yy.c
fi
;;
esac
fi
- if [ ! -f lex.yy.c ]; then
+ if test ! -f lex.yy.c; then
echo 'main() { return 0; }' >lex.yy.c
fi
;;
- makeinfo)
+ help2man*)
+ echo 1>&2 "\
+WARNING: \`$1' is $msg. You should only need it if
+ you modified a dependency of a manual page. You may need the
+ \`Help2man' package in order for those modifications to take
+ effect. You can get \`Help2man' from any GNU archive site."
+
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -f "$file"; then
+ touch $file
+ else
+ test -z "$file" || exec >$file
+ echo ".ab help2man is required to generate this page"
+ exit $?
+ fi
+ ;;
+
+ makeinfo*)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified a \`.texi' or \`.texinfo' file, or any other file
indirectly affecting the aspect of the manual. The spurious
call might also be the consequence of using a buggy \`make' (AIX,
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ # The file to touch is that specified with -o ...
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -z "$file"; then
- file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
+ # ... or it is the one specified with @setfilename ...
+ infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
+ file=`sed -n '
+ /^@setfilename/{
+ s/.* \([^ ]*\) *$/\1/
+ p
+ q
+ }' $infile`
+ # ... or it is derived from the source name (dir/f.texi becomes f.info)
+ test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
fi
+ # If the file does not exist, the user really needs makeinfo;
+ # let's fail without touching anything.
+ test -f $file || exit 1
touch $file
;;
+ tar*)
+ shift
+
+ # We have already tried tar in the generic part.
+ # Look for gnutar/gtar before invocation to avoid ugly error
+ # messages.
+ if (gnutar --version > /dev/null 2>&1); then
+ gnutar "$@" && exit 0
+ fi
+ if (gtar --version > /dev/null 2>&1); then
+ gtar "$@" && exit 0
+ fi
+ firstarg="$1"
+ if shift; then
+ case $firstarg in
+ *o*)
+ firstarg=`echo "$firstarg" | sed s/o//`
+ tar "$firstarg" "$@" && exit 0
+ ;;
+ esac
+ case $firstarg in
+ *h*)
+ firstarg=`echo "$firstarg" | sed s/h//`
+ tar "$firstarg" "$@" && exit 0
+ ;;
+ esac
+ fi
+
+ echo 1>&2 "\
+WARNING: I can't seem to be able to run \`tar' with the given arguments.
+ You may want to install GNU tar or Free paxutils, or check the
+ command line arguments."
+ exit 1
+ ;;
+
*)
echo 1>&2 "\
-WARNING: \`$1' is needed, and you do not seem to have it handy on your
- system. You might have modified some files without having the
+WARNING: \`$1' is needed, and is $msg.
+ You might have modified some files without having the
proper tools for further handling them. Check the \`README' file,
- it often tells you about the needed prerequirements for installing
+ it often tells you about the needed prerequisites for installing
this package. You may also peek at any GNU archive site, in case
some other package would contain this missing \`$1' program."
exit 1
@@ -188,3 +366,11 @@
esac
exit 0
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
xbmc-9.11-gymcodec.patch:
ym2612.h | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
--- NEW FILE xbmc-9.11-gymcodec.patch ---
diff -Naur xbmc-9.11-11.0/xbmc/cores/paplayer/GYMCodec/ym2612.h xbmc-9.11-11.1/xbmc/cores/paplayer/GYMCodec/ym2612.h
--- xbmc-9.11-11.0/xbmc/cores/paplayer/GYMCodec/ym2612.h 2008-07-15 21:14:31.000000000 +0200
+++ xbmc-9.11-11.1/xbmc/cores/paplayer/GYMCodec/ym2612.h 2010-02-03 07:33:21.000000000 +0100
@@ -15,7 +15,7 @@
#define INLINE __inline
typedef struct slot__ {
- int *DT; // paramètre detune
+ unsigned int *DT; // paramètre detune
int MUL; // paramètre "multiple de fréquence"
int TL; // Total Level = volume lorsque l'enveloppe est au plus haut
int TLL; // Total Level ajusted
@@ -24,10 +24,10 @@
int KSR; // Key Scale Rate = cette valeur est calculée par rapport à la fréquence actuelle, elle va influer
// sur les différents paramètres de l'enveloppe comme l'attaque, le decay ... comme dans la réalité !
int SEG; // Type enveloppe SSG
- int *AR; // Attack Rate (table pointeur) = Taux d'attaque (AR[KSR])
- int *DR; // Decay Rate (table pointeur) = Taux pour la régression (DR[KSR])
- int *SR; // Sustin Rate (table pointeur) = Taux pour le maintien (SR[KSR])
- int *RR; // Release Rate (table pointeur) = Taux pour le relâchement (RR[KSR])
+ unsigned int *AR; // Attack Rate (table pointeur) = Taux d'attaque (AR[KSR])
+ unsigned int *DR; // Decay Rate (table pointeur) = Taux pour la régression (DR[KSR])
+ unsigned int *SR; // Sustin Rate (table pointeur) = Taux pour le maintien (SR[KSR])
+ unsigned int *RR; // Release Rate (table pointeur) = Taux pour le relâchement (RR[KSR])
int Fcnt; // Frequency Count = compteur-fréquence pour déterminer l'amplitude actuelle (SIN[Finc >> 16])
int Finc; // frequency step = pas d'incrémentation du compteur-fréquence
// plus le pas est grand, plus la fréquence est aïgu (ou haute)
xbmc-9.11-hdhomerun.patch:
Makefile.in | 5 --
configure.in | 1
xbmc/FileSystem/HDHomeRun.h | 78 +++++++++++++++++++++++++++++---------------
3 files changed, 53 insertions(+), 31 deletions(-)
--- NEW FILE xbmc-9.11-hdhomerun.patch ---
--- xbmc-9.11/Makefile.in.orig 2010-03-06 13:36:20.065364213 +0100
+++ xbmc-9.11/Makefile.in 2010-03-06 13:36:50.136366154 +0100
@@ -82,7 +82,6 @@
LIB_DIRS=\
xbmc/lib/cximage-6.0 \
xbmc/lib/libexif \
- xbmc/lib/libhdhomerun \
xbmc/lib/libid3tag \
xbmc/lib/libPython/linux
@@ -273,8 +272,6 @@
endif
libexif: dllloader
$(MAKE) -C xbmc/lib/libexif
-libhdhomerun: dllloader
- $(MAKE) -C xbmc/lib/libhdhomerun
libid3tag: dllloader
$(MAKE) -C xbmc/lib/libid3tag
papcodecs: dllloader dvdpcodecs
@@ -304,7 +301,7 @@
$(MAKE) -C xbmc/lib/cximage-6.0
codecs: papcodecs dvdpcodecs
-libs: libhdhomerun libid3tag imagelib libexif python
+libs: libid3tag imagelib libexif python
externals: codecs libs python visualizations screensavers
xcode_depends: \
--- xbmc-9.11/xbmc/FileSystem/HDHomeRun.h.orig 2010-03-06 13:51:33.326488131 +0100
+++ xbmc-9.11/xbmc/FileSystem/HDHomeRun.h 2010-03-06 13:51:53.899488929 +0100
@@ -22,7 +22,7 @@
#include "IDirectory.h"
#include "DynamicDll.h"
-#include "lib/libhdhomerun/hdhomerun.h"
+#include <hdhomerun/hdhomerun.h>
#include "FileSystem/IFile.h"
class DllHdHomeRunInterface
@@ -44,31 +44,57 @@
class DllHdHomeRun : public DllDynamic, public DllHdHomeRunInterface
{
- DECLARE_DLL_WRAPPER(DllHdHomeRun, DLL_PATH_LIBHDHOMERUN)
- DEFINE_METHOD5(int, discover_find_devices_custom, (uint32_t p1, uint32_t p2, uint32_t p3, struct hdhomerun_discover_device_t p4[], int p5))
- DEFINE_METHOD2(struct hdhomerun_device_t*, device_create_from_str, (const char* p1, struct hdhomerun_debug_t *p2))
- DEFINE_METHOD1(void, device_destroy, (struct hdhomerun_device_t* p1))
- DEFINE_METHOD1(int, device_stream_start, (struct hdhomerun_device_t* p1))
- DEFINE_METHOD3(uint8_t*, device_stream_recv, (struct hdhomerun_device_t* p1, unsigned int p2, unsigned int* p3))
- DEFINE_METHOD1(void, device_stream_stop, (struct hdhomerun_device_t* p1))
- DEFINE_METHOD2(int, device_set_tuner_channel, (struct hdhomerun_device_t *p1, const char *p2))
- DEFINE_METHOD2(int, device_set_tuner_program, (struct hdhomerun_device_t *p1, const char *p2))
- DEFINE_METHOD2(int, device_set_tuner_from_str, (struct hdhomerun_device_t *p1, const char *p2))
- DEFINE_METHOD2(void, device_set_tuner, (struct hdhomerun_device_t *p1, unsigned int p2))
- DEFINE_METHOD3(int, device_get_tuner_status, (struct hdhomerun_device_t *p1, char **p2, struct hdhomerun_tuner_status_t *p3));
- BEGIN_METHOD_RESOLVE()
- RESOLVE_METHOD_RENAME(hdhomerun_discover_find_devices_custom, discover_find_devices_custom)
- RESOLVE_METHOD_RENAME(hdhomerun_device_create_from_str, device_create_from_str)
- RESOLVE_METHOD_RENAME(hdhomerun_device_destroy, device_destroy)
- RESOLVE_METHOD_RENAME(hdhomerun_device_stream_start, device_stream_start)
- RESOLVE_METHOD_RENAME(hdhomerun_device_stream_recv, device_stream_recv)
- RESOLVE_METHOD_RENAME(hdhomerun_device_stream_stop, device_stream_stop)
- RESOLVE_METHOD_RENAME(hdhomerun_device_set_tuner_channel, device_set_tuner_channel)
- RESOLVE_METHOD_RENAME(hdhomerun_device_set_tuner_program, device_set_tuner_program)
- RESOLVE_METHOD_RENAME(hdhomerun_device_set_tuner_from_str, device_set_tuner_from_str)
- RESOLVE_METHOD_RENAME(hdhomerun_device_set_tuner, device_set_tuner)
- RESOLVE_METHOD_RENAME(hdhomerun_device_get_tuner_status, device_get_tuner_status)
- END_METHOD_RESOLVE()
+public:
+ virtual ~DllHdHomeRun () {};
+
+ virtual int discover_find_devices_custom (uint32_t p1, uint32_t p2, uint32_t p3, struct hdhomerun_discover_device_t p4[], int p5)
+ { return ::hdhomerun_discover_find_devices_custom (p1, p2, p3, p4, p5); }
+
+ virtual struct hdhomerun_device_t *device_create_from_str (const char* p1, struct hdhomerun_debug_t *p2)
+ { return ::hdhomerun_device_create_from_str (p1, p2); }
+
+ virtual void device_destroy (struct hdhomerun_device_t* p1)
+ { ::hdhomerun_device_destroy (p1); }
+
+ virtual int device_stream_start (struct hdhomerun_device_t* p1)
+ { return ::hdhomerun_device_stream_start (p1); }
+
+
+ virtual uint8_t *device_stream_recv (struct hdhomerun_device_t* p1, unsigned int p2, unsigned int* p3)
+ {
+ uint8_t *retval;
+
+ size_t tmp = *p3;
+ retval = ::hdhomerun_device_stream_recv (p1, p2, &tmp);
+ *p3 = tmp;
+
+ return retval;
+ }
+
+ virtual void device_stream_stop (struct hdhomerun_device_t* p1)
+ { ::hdhomerun_device_stream_stop (p1); }
+
+ virtual int device_set_tuner_channel (struct hdhomerun_device_t *p1, const char *p2)
+ { return ::hdhomerun_device_set_tuner_channel (p1, p2); }
+
+ virtual int device_set_tuner_program (struct hdhomerun_device_t *p1, const char *p2)
+ { return ::hdhomerun_device_set_tuner_program (p1, p2); }
+
+
+ virtual int device_set_tuner_from_str (struct hdhomerun_device_t *p1, const char *p2)
+ { return ::hdhomerun_device_set_tuner_from_str (p1, p2); }
+
+
+ virtual void device_set_tuner (struct hdhomerun_device_t *p1, unsigned int p2)
+ { ::hdhomerun_device_set_tuner (p1, p2); }
+
+ virtual int device_get_tuner_status (struct hdhomerun_device_t *p1, char **p2, struct hdhomerun_tuner_status_t *p3)
+ { return ::hdhomerun_device_get_tuner_status (p1, p2, p3); }
+
+ // DLL faking.
+ virtual bool ResolveExports() { return true; }
+ virtual bool Load() { return true; }
+ virtual void Unload() {}
};
namespace DIRECTORY
--- xbmc-9.11/configure.in.orig 2010-03-06 13:44:45.670365692 +0100
+++ xbmc-9.11/configure.in 2010-03-06 13:44:57.298492458 +0100
@@ -989,7 +989,6 @@
xbmc/lib/libRTV/Makefile \
xbmc/lib/libexif/Makefile \
xbmc/lib/libXDAAP/Makefile \
- xbmc/lib/libhdhomerun/Makefile \
xbmc/lib/libshout/Makefile \
xbmc/lib/libsquish/Makefile \
xbmc/lib/libid3tag/Makefile \
xbmc-9.11-libdca.patch:
configure.in | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
--- NEW FILE xbmc-9.11-libdca.patch ---
--- xbmc-9.11-b1/configure.in.config 2009-11-18 02:47:48.000000000 +0100
+++ xbmc-9.11-b1/configure.in 2009-11-25 20:25:05.973069389 +0100
@@ -560,7 +560,7 @@
# External libdts
if test "$use_external_libraries" = "yes" || test "$use_external_libdts" = "yes"; then
- AC_CHECK_LIB([dts], [main],, AC_MSG_ERROR($missing_library))
+ AC_CHECK_LIB([dca], [main],, AC_MSG_ERROR($missing_library))
AC_MSG_NOTICE($external_libdts_enabled)
USE_EXTERNAL_LIBDTS=1
@@ -1054,6 +1054,8 @@
if [[ $3 != "1" ]]; then
if [[ -d $1 ]]; then
pushd $1
+ [[ -f configure ]] && chmod +x configure
+ [[ -f configure2 ]] && chmod +x configure2
$2
if [[ $? -ne 0 ]]; then
popd
xbmc-9.11-libid3tag.patch:
metadata.c | 3 +++
1 file changed, 3 insertions(+)
--- NEW FILE xbmc-9.11-libid3tag.patch ---
diff -Naur xbmc-9.11-11.0/xbmc/lib/libid3tag/libid3tag/metadata.c xbmc-9.11-11.1/xbmc/lib/libid3tag/libid3tag/metadata.c
--- xbmc-9.11-11.0/xbmc/lib/libid3tag/libid3tag/metadata.c 2009-10-13 02:48:48.000000000 +0200
+++ xbmc-9.11-11.1/xbmc/lib/libid3tag/libid3tag/metadata.c 2010-02-03 07:33:21.000000000 +0100
@@ -23,6 +23,9 @@
# include "config.h"
# endif
+#include <string.h>
+#include <stdlib.h>
+
# include "metadata.h"
# include "global.h"
# include "ucs4.h"
xbmc-9.11-librtv.patch:
Makefile.in | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE xbmc-9.11-librtv.patch ---
diff -Naur xbmc-9.11-11.0/xbmc/lib/libRTV/Makefile.in xbmc-9.11-11.1/xbmc/lib/libRTV/Makefile.in
--- xbmc-9.11-11.0/xbmc/lib/libRTV/Makefile.in 2009-03-22 19:56:49.000000000 +0100
+++ xbmc-9.11-11.1/xbmc/lib/libRTV/Makefile.in 2010-02-03 07:33:21.000000000 +0100
@@ -1,7 +1,7 @@
SRCS=crypt.c guideclient.c GuideParser.c httpclient.c httpfsclient.c interface.c md5.c netclient.c rtv.c sleep.c
-CFLAGS += -D_LINUX -D__unix__
-CXXFLAGS += -D_LINUX -D__unix__
+CFLAGS += -D_LINUX
+CXXFLAGS += -D_LINUX
LIB= librtv-@ARCH@.a
xbmc-9.11-macdll.patch:
Makefile.in | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE xbmc-9.11-macdll.patch ---
diff -Naur xbmc-9.11-11.0/xbmc/cores/paplayer/MACDll/Makefile.in xbmc-9.11-11.1/xbmc/cores/paplayer/MACDll/Makefile.in
--- xbmc-9.11-11.0/xbmc/cores/paplayer/MACDll/Makefile.in 2010-02-03 07:34:17.000000000 +0100
+++ xbmc-9.11-11.1/xbmc/cores/paplayer/MACDll/Makefile.in 2010-02-03 07:33:21.000000000 +0100
@@ -35,8 +35,8 @@
Source/MACLib/Old/AntiPredictorNormal.o \
Source/MACDll/MACDll.o
-CFLAGS +=-ISource/Shared -DPIC -fPIC -ISource/MACLib -pedantic -D__GNUC_IA32__ -DBUILD_CROSS_PLATFORM -D_LINUX
-CXXFLAGS +=-ISource/Shared -DPIC -fPIC -ISource/MACLib -pedantic -D__GNUC_IA32__ -DBUILD_CROSS_PLATFORM -D_LINUX
+CFLAGS +=-ISource/Shared -DPIC -fPIC -ISource/MACLib -D__GNUC_IA32__ -DBUILD_CROSS_PLATFORM -D_LINUX
+CXXFLAGS +=-ISource/Shared -DPIC -fPIC -ISource/MACLib -D__GNUC_IA32__ -DBUILD_CROSS_PLATFORM -D_LINUX
ARCH=@ARCH@
xbmc-9.11-maclib.patch:
Prepare.cpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--- NEW FILE xbmc-9.11-maclib.patch ---
diff -Naur xbmc-9.11-11.0/xbmc/cores/paplayer/MACDll/Source/MACLib/Prepare.cpp xbmc-9.11-11.1/xbmc/cores/paplayer/MACDll/Source/MACLib/Prepare.cpp
--- xbmc-9.11-11.0/xbmc/cores/paplayer/MACDll/Source/MACLib/Prepare.cpp 2008-07-15 21:14:31.000000000 +0200
+++ xbmc-9.11-11.1/xbmc/cores/paplayer/MACDll/Source/MACLib/Prepare.cpp 2010-02-03 07:33:21.000000000 +0100
@@ -1,9 +1,9 @@
#include "All.h"
#include "Prepare.h"
-const uint32 CRC32_TABLE[256] = {0,1996959894,3993919788,2567524794,124634137,1886057615,3915621685,2657392035,249268274,2044508324,3772115230,2547177864,162941995,2125561021,3887607047,2428444049,498536548,1789927666,4089016648,2227061214,450548861,1843258603,4107580753,2211677639,325883990,1684777152,4251122042,2321926636,335633487,1661365465,4195302755,2366115317,997073096,1281953886,3579855332,2724688242,1006888145,1258607687,3524101629,2768942443,901097722,1119000684,3686517206,2898065728,853044451,1172266101,3705015759,2882616665,651767980,1373503546,3369554304,3218104598,565507253,1454621731,3485111705,3099436303,671266974,1594198024,3322730930,2970347812,795835527,1483230225,3244367275,3060149565,1994146192,31158534,2563907772,4023717930,1907459465,112637215,2680153253,3904427059,2013776290,251722036,2517215374,3775830040,2137656763,141376813,2439277719,3865271297,1802195444,476864866,2238001368,
- 4066508878,1812370925,453092731,2181625025,4111451223,1706088902,314042704,2344532202,4240017532,1658658271,366619977,2362670323,4224994405,1303535960,984961486,2747007092,3569037538,1256170817,1037604311,2765210733,3554079995,1131014506,879679996,2909243462,3663771856,1141124467,855842277,2852801631,3708648649,1342533948,654459306,3188396048,3373015174,1466479909,544179635,3110523913,3462522015,1591671054,702138776,2966460450,3352799412,1504918807,783551873,3082640443,3233442989,3988292384,2596254646,62317068,1957810842,3939845945,2647816111,81470997,1943803523,3814918930,2489596804,225274430,2053790376,3826175755,2466906013,167816743,2097651377,4027552580,2265490386,503444072,1762050814,4150417245,2154129355,426522225,1852507879,4275313526,2312317920,282753626,1742555852,4189708143,2394877945,397917763,1622183637,3604390888,2714866558,953729732,1340076626,3518719985,2797360999,1068828381,1219638859,3624741850,
- 2936675148,906185462,1090812512,3747672003,2825379669,829329135,1181335161,3412177804,3160834842,628085408,1382605366,3423369109,3138078467,570562233,1426400815,3317316542,2998733608,733239954,1555261956,3268935591,3050360625,752459403,1541320221,2607071920,3965973030,1969922972,40735498,2617837225,3943577151,1913087877,83908371,2512341634,3803740692,2075208622,213261112,2463272603,3855990285,2094854071,198958881,2262029012,4057260610,1759359992,534414190,2176718541,4139329115,1873836001,414664567,2282248934,4279200368,1711684554,285281116,2405801727,4167216745,1634467795,376229701,2685067896,3608007406,1308918612,956543938,2808555105,3495958263,1231636301,1047427035,2932959818,3654703836,1088359270,936918000,2847714899,3736837829,1202900863,817233897,3183342108,3401237130,1404277552,615818150,3134207493,3453421203,1423857449,601450431,3009837614,3294710456,1567103746,711928724,3020668471,3272380065,1510334235,755167117};
+const uint32 CRC32_TABLE[256] = {0U,1996959894U,3993919788U,2567524794U,124634137U,1886057615U,3915621685U,2657392035U,249268274U,2044508324U,3772115230U,2547177864U,162941995U,2125561021U,3887607047U,2428444049U,498536548U,1789927666U,4089016648U,2227061214U,450548861U,1843258603U,4107580753U,2211677639U,325883990U,1684777152U,4251122042U,2321926636U,335633487U,1661365465U,4195302755U,2366115317U,997073096U,1281953886U,3579855332U,2724688242U,1006888145U,1258607687U,3524101629U,2768942443U,901097722U,1119000684U,3686517206U,2898065728U,853044451U,1172266101U,3705015759U,2882616665U,651767980U,1373503546U,3369554304U,3218104598U,565507253U,1454621731U,3485111705U,3099436303U,671266974U,1594198024U,3322730930U,2970347812U,795835527U,1483230225U,3244367275U,3060149565U,1994146192U,31158534U,2563907772U,4023717930U,1907459465U,112637215U,2680153253U,3904427059U,2013776290U,251722036U,2517215374U,3775830040U,2137656763U,141376813U,2439277719U,3865271297U,1802195444U,476864866U,2
238001368U,
+ 4066508878U,1812370925U,453092731U,2181625025U,4111451223U,1706088902U,314042704U,2344532202U,4240017532U,1658658271U,366619977U,2362670323U,4224994405U,1303535960U,984961486U,2747007092U,3569037538U,1256170817U,1037604311U,2765210733U,3554079995U,1131014506U,879679996U,2909243462U,3663771856U,1141124467U,855842277U,2852801631U,3708648649U,1342533948U,654459306U,3188396048U,3373015174U,1466479909U,544179635U,3110523913U,3462522015U,1591671054U,702138776U,2966460450U,3352799412U,1504918807U,783551873U,3082640443U,3233442989U,3988292384U,2596254646U,62317068U,1957810842U,3939845945U,2647816111U,81470997U,1943803523U,3814918930U,2489596804U,225274430U,2053790376U,3826175755U,2466906013U,167816743U,2097651377U,4027552580U,2265490386U,503444072U,1762050814U,4150417245U,2154129355U,426522225U,1852507879U,4275313526U,2312317920U,282753626U,1742555852U,4189708143U,2394877945U,397917763U,1622183637U,3604390888U,2714866558U,953729732U,1340076626U,3518719985U,2797360999U,1068828381
U,1219638859U,3624741850U,
+ 2936675148U,906185462U,1090812512U,3747672003U,2825379669U,829329135U,1181335161U,3412177804U,3160834842U,628085408U,1382605366U,3423369109U,3138078467U,570562233U,1426400815U,3317316542U,2998733608U,733239954U,1555261956U,3268935591U,3050360625U,752459403U,1541320221U,2607071920U,3965973030U,1969922972U,40735498U,2617837225U,3943577151U,1913087877U,83908371U,2512341634U,3803740692U,2075208622U,213261112U,2463272603U,3855990285U,2094854071U,198958881U,2262029012U,4057260610U,1759359992U,534414190U,2176718541U,4139329115U,1873836001U,414664567U,2282248934U,4279200368U,1711684554U,285281116U,2405801727U,4167216745U,1634467795U,376229701U,2685067896U,3608007406U,1308918612U,956543938U,2808555105U,3495958263U,1231636301U,1047427035U,2932959818U,3654703836U,1088359270U,936918000U,2847714899U,3736837829U,1202900863U,817233897U,3183342108U,3401237130U,1404277552U,615818150U,3134207493U,3453421203U,1423857449U,601450431U,3009837614U,3294710456U,1567103746U,711928724U,3020668471U
,3272380065U,1510334235U,755167117U};
int CPrepare::Prepare(const unsigned char * pRawData, int nBytes, const WAVEFORMATEX * pWaveFormatEx, int * pOutputX, int *pOutputY, unsigned int *pCRC, int *pSpecialCodes, int *pPeakLevel)
{
xbmc-9.11-remlibass.patch:
Makefile.in | 6 ------
configure.in | 1 -
2 files changed, 7 deletions(-)
--- NEW FILE xbmc-9.11-remlibass.patch ---
--- xbmc-9.11/configure.in.orig 2010-01-02 18:20:48.334073413 +0100
+++ xbmc-9.11/configure.in 2010-01-02 18:50:21.184073054 +0100
@@ -962,7 +962,6 @@
xbmc/cores/paplayer/WavPackCodec/Makefile \
xbmc/cores/paplayer/YMCodec/StSoundLibrary/Makefile \
guilib/common/Makefile \
- xbmc/lib/libass/xbmc/Makefile \
xbmc/lib/libXBMS/Makefile \
xbmc/lib/libRTV/Makefile \
xbmc/lib/libexif/Makefile \
--- xbmc-9.11/Makefile.in.orig 2010-01-02 17:25:20.723105079 +0100
+++ xbmc-9.11/Makefile.in 2010-01-02 17:25:53.640198700 +0100
@@ -58,9 +58,6 @@
DVDPCODECS_DIRS= \
xbmc/cores/dvdplayer/Codecs \
xbmc/cores/dvdplayer/Codecs/libdvd
-ifneq (@USE_EXTERNAL_LIBASS@,1)
- DVDPCODECS_DIRS+=xbmc/lib/libass/xbmc
-endif
PAPCODECS_DIRS= \
xbmc/cores/paplayer/AC3Codec \
@@ -268,9 +265,6 @@
dvdpcodecs: dllloader
$(MAKE) -C xbmc/cores/dvdplayer/Codecs
$(MAKE) -C xbmc/cores/dvdplayer/Codecs/libdvd
-ifneq (@USE_EXTERNAL_LIBASS@,1)
- $(MAKE) -C xbmc/lib/libass/xbmc
-endif
eventclients:
ifeq ($(findstring osx,$(ARCH)), osx)
$(MAKE) -C tools/EventClients/Clients/OSXRemote
xbmc-9.11-remove-goahead.patch:
Makefile.in | 7 +------
configure.in | 1 -
guilib/system.h | 2 +-
3 files changed, 2 insertions(+), 8 deletions(-)
--- NEW FILE xbmc-9.11-remove-goahead.patch ---
--- configure.in.orig 2010-03-06 04:48:49.233198314 -0500
+++ configure.in 2010-03-06 04:51:02.297020657 -0500
@@ -990,7 +990,6 @@
xbmc/lib/libexif/Makefile \
xbmc/lib/libXDAAP/Makefile \
xbmc/lib/libhdhomerun/Makefile \
- xbmc/lib/libGoAhead/Makefile \
xbmc/lib/libshout/Makefile \
xbmc/lib/libsquish/Makefile \
xbmc/lib/libid3tag/Makefile \
--- Makefile.in.orig 2010-03-06 04:49:38.948896140 -0500
+++ Makefile.in 2010-03-06 04:50:24.628895410 -0500
@@ -29,7 +29,6 @@
xbmc/karaoke \
xbmc/lib/libcmyth \
xbmc/lib/libhts \
- xbmc/lib/libGoAhead \
xbmc/lib/libPython \
xbmc/lib/libPython/xbmcmodule \
xbmc/lib/libRTMP \
@@ -219,8 +218,6 @@
$(MAKE) -C xbmc/lib/libXBMS
xbmc/lib/libXDAAP/libxdaap-@ARCH@.a: force
$(MAKE) -C xbmc/lib/libXDAAP
-xbmc/lib/libGoAhead/libGoAhead-@ARCH@.a: force
- $(MAKE) -C xbmc/lib/libGoAhead
xbmc/lib/sqLite/sqllite.a: force
$(MAKE) -C xbmc/lib/sqLite
xbmc/lib/UnrarXLib/UnrarXLib.a: force
@@ -315,8 +312,7 @@
xbmc/lib/libXBMS/libxbms-@ARCH@.a \
xbmc/lib/libRTV/librtv-@ARCH@.a \
xbmc/lib/libXDAAP/libxdaap-@ARCH@.a \
- xbmc/lib/libshout/libshout-@ARCH@.a \
- xbmc/lib/libGoAhead/libGoAhead-@ARCH@.a
+ xbmc/lib/libshout/libshout-@ARCH@.a
# platform independend objects
OBJSXBMC= \
@@ -355,7 +351,6 @@
xbmc/lib/libUPnP/libupnp-@ARCH@.a \
xbmc/lib/libXBMS/libxbms-@ARCH@.a \
xbmc/lib/libXDAAP/libxdaap-@ARCH@.a \
- xbmc/lib/libGoAhead/libGoAhead-@ARCH@.a \
xbmc/lib/sqLite/sqllite.a \
xbmc/lib/libsquish/libsquish-@ARCH@.a \
xbmc/screensavers/screensaver.a \
--- guilib/system.h.orig 2010-03-06 05:42:46.227020727 -0500
+++ guilib/system.h 2010-03-06 05:44:35.429895860 -0500
@@ -44,7 +44,7 @@
#define HAS_UPNP
#define HAS_VIDEO_PLAYBACK
#define HAS_VISUALISATION
-#define HAS_WEB_SERVER
+/* undef HAS_WEB_SERVER */
#define HAS_AC3_CODEC
#define HAS_DTS_CODEC
xbmc-9.11-rsxs-0.9.diff:
configure.in | 6 ++++--
xbmc/screensavers/rsxs-0.9/configure | 8 ++++----
xbmc/screensavers/rsxs-0.9/configure.ac | 8 ++++----
xbmc/screensavers/rsxs-0.9/src/Makefile.common | 2 +-
xbmc/screensavers/rsxs-0.9/src/cyclone/Makefile.in | 2 +-
xbmc/screensavers/rsxs-0.9/src/euphoria/Makefile.in | 2 +-
xbmc/screensavers/rsxs-0.9/src/fieldlines/Makefile.in | 2 +-
xbmc/screensavers/rsxs-0.9/src/flocks/Makefile.in | 2 +-
xbmc/screensavers/rsxs-0.9/src/flux/Makefile.in | 2 +-
xbmc/screensavers/rsxs-0.9/src/helios/Makefile.in | 2 +-
xbmc/screensavers/rsxs-0.9/src/hyperspace/Makefile.in | 2 +-
xbmc/screensavers/rsxs-0.9/src/lattice/Makefile.in | 2 +-
xbmc/screensavers/rsxs-0.9/src/plasma/Makefile.in | 2 +-
xbmc/screensavers/rsxs-0.9/src/skyrocket/Makefile.in | 2 +-
xbmc/screensavers/rsxs-0.9/src/solarwinds/Makefile.in | 2 +-
15 files changed, 24 insertions(+), 22 deletions(-)
--- NEW FILE xbmc-9.11-rsxs-0.9.diff ---
diff -Naur xbmc-9.11-8.3/configure.in xbmc-9.11-8.4/configure.in
--- xbmc-9.11-8.3/configure.in 2010-01-22 11:06:37.000000000 +0100
+++ xbmc-9.11-8.4/configure.in 2010-01-24 06:05:15.000000000 +0100
@@ -1363,8 +1363,10 @@
--disable-skyrocket
else
./configure \
- CFLAGS="-fPIC" \
- CXXFLAGS="-fPIC" \
+ CPPFLAGS="$CPPFLAGS" \
+ CFLAGS="$CFLAGS -fPIC" \
+ CXXFLAGS="$CXXFLAGS -fPIC" \
+ --prefix="${prefix}" --includedir="${includedir}" --libdir="${libdir}" --datadir="${datadir}" \
--without-xscreensaver \
--disable-sound \
--disable-cyclone \
diff -Naur xbmc-9.11-8.3/xbmc/screensavers/rsxs-0.9/configure xbmc-9.11-8.4/xbmc/screensavers/rsxs-0.9/configure
--- xbmc-9.11-8.3/xbmc/screensavers/rsxs-0.9/configure 2008-07-20 17:54:35.000000000 +0200
+++ xbmc-9.11-8.4/xbmc/screensavers/rsxs-0.9/configure 2010-01-24 06:03:38.000000000 +0100
@@ -3241,7 +3241,7 @@
fi
-CXXFLAGS=`echo $CXXFLAGS | sed -e s,-O2,-O3,`
+#CXXFLAGS=`echo $CXXFLAGS | sed -e s,-O2,-O3,`
ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -3469,9 +3469,9 @@
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-if test x"$GXX" = x"yes"; then
- CXXFLAGS=`echo $CXXFLAGS -Wall`
-fi
+#if test x"$GXX" = x"yes"; then
+# CXXFLAGS=`echo $CXXFLAGS -Wall`
+#fi
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
diff -Naur xbmc-9.11-8.3/xbmc/screensavers/rsxs-0.9/configure.ac xbmc-9.11-8.4/xbmc/screensavers/rsxs-0.9/configure.ac
--- xbmc-9.11-8.3/xbmc/screensavers/rsxs-0.9/configure.ac 2007-10-08 19:37:14.000000000 +0200
+++ xbmc-9.11-8.4/xbmc/screensavers/rsxs-0.9/configure.ac 2010-01-24 06:03:38.000000000 +0100
@@ -16,12 +16,12 @@
LT_AC_PROG_SED
AC_LANG(C++)
AC_PROG_CXX
-CXXFLAGS=`echo $CXXFLAGS | sed -e s,-O2,-O3,`
+#CXXFLAGS=`echo $CXXFLAGS | sed -e s,-O2,-O3,`
AC_PROG_CXXCPP
-if test x"$GXX" = x"yes"; then
- CXXFLAGS=`echo $CXXFLAGS -Wall`
-fi
+#if test x"$GXX" = x"yes"; then
+# CXXFLAGS=`echo $CXXFLAGS -Wall`
+#fi
AC_PROG_CC
AM_PROG_CC_C_O
diff -Naur xbmc-9.11-8.3/xbmc/screensavers/rsxs-0.9/src/cyclone/Makefile.in xbmc-9.11-8.4/xbmc/screensavers/rsxs-0.9/src/cyclone/Makefile.in
--- xbmc-9.11-8.3/xbmc/screensavers/rsxs-0.9/src/cyclone/Makefile.in 2009-01-24 23:51:01.000000000 +0100
+++ xbmc-9.11-8.4/xbmc/screensavers/rsxs-0.9/src/cyclone/Makefile.in 2010-01-24 06:03:38.000000000 +0100
@@ -278,7 +278,7 @@
@DLOPEN_TRUE@LIBLTDL_CPPFLAGS = -I$(top_builddir)/libltdl
AM_CPPFLAGS = -DPKGDATADIR=\"$(pkgdatadir)\" -I$(srcdir)/.. -I$(top_srcdir)/lib $(X_CPPFLAGS)
AM_LDFLAGS =
-AM_CXXFLAGS = -Wall -funroll-loops
+AM_CXXFLAGS =
AM_ETAGSFLAGS = --extra=fq
rs_cyclone_SOURCES = $(COMMON) $(COLOR) $(VECTOR) blend.cc blend.hh cyclone.cc \
cyclone.hh particle.cc particle.hh
diff -Naur xbmc-9.11-8.3/xbmc/screensavers/rsxs-0.9/src/euphoria/Makefile.in xbmc-9.11-8.4/xbmc/screensavers/rsxs-0.9/src/euphoria/Makefile.in
--- xbmc-9.11-8.3/xbmc/screensavers/rsxs-0.9/src/euphoria/Makefile.in 2009-01-24 23:51:01.000000000 +0100
+++ xbmc-9.11-8.4/xbmc/screensavers/rsxs-0.9/src/euphoria/Makefile.in 2010-01-24 06:03:38.000000000 +0100
@@ -290,7 +290,7 @@
AM_CPPFLAGS = -DPKGDATADIR=\"$(pkgdatadir)\" -I$(srcdir)/.. \
-I$(top_srcdir)/lib $(X_CPPFLAGS) $(IMAGE_CPPFLAGS)
AM_LDFLAGS = $(IMAGE_LDFLAGS)
-AM_CXXFLAGS = -Wall -funroll-loops $(IMAGE_CXXFLAGS)
+AM_CXXFLAGS = $(IMAGE_CXXFLAGS)
AM_ETAGSFLAGS = --extra=fq
rs_euphoria_SOURCES = $(COMMON) $(COLOR) $(VECTOR) $(IMAGE) euphoria.cc \
euphoria.hh wisp.cc wisp.hh
diff -Naur xbmc-9.11-8.3/xbmc/screensavers/rsxs-0.9/src/fieldlines/Makefile.in xbmc-9.11-8.4/xbmc/screensavers/rsxs-0.9/src/fieldlines/Makefile.in
--- xbmc-9.11-8.3/xbmc/screensavers/rsxs-0.9/src/fieldlines/Makefile.in 2009-01-24 23:51:01.000000000 +0100
+++ xbmc-9.11-8.4/xbmc/screensavers/rsxs-0.9/src/fieldlines/Makefile.in 2010-01-24 06:03:38.000000000 +0100
@@ -277,7 +277,7 @@
@DLOPEN_TRUE@LIBLTDL_CPPFLAGS = -I$(top_builddir)/libltdl
AM_CPPFLAGS = -DPKGDATADIR=\"$(pkgdatadir)\" -I$(srcdir)/.. -I$(top_srcdir)/lib $(X_CPPFLAGS)
AM_LDFLAGS =
-AM_CXXFLAGS = -Wall -funroll-loops
+AM_CXXFLAGS =
AM_ETAGSFLAGS = --extra=fq
rs_fieldlines_SOURCES = $(COMMON) $(COLOR) $(VECTOR) fieldlines.cc \
fieldlines.hh ion.hh
diff -Naur xbmc-9.11-8.3/xbmc/screensavers/rsxs-0.9/src/flocks/Makefile.in xbmc-9.11-8.4/xbmc/screensavers/rsxs-0.9/src/flocks/Makefile.in
--- xbmc-9.11-8.3/xbmc/screensavers/rsxs-0.9/src/flocks/Makefile.in 2009-01-24 23:51:01.000000000 +0100
+++ xbmc-9.11-8.4/xbmc/screensavers/rsxs-0.9/src/flocks/Makefile.in 2010-01-24 06:03:38.000000000 +0100
@@ -277,7 +277,7 @@
@DLOPEN_TRUE@LIBLTDL_CPPFLAGS = -I$(top_builddir)/libltdl
AM_CPPFLAGS = -DPKGDATADIR=\"$(pkgdatadir)\" -I$(srcdir)/.. -I$(top_srcdir)/lib $(X_CPPFLAGS)
AM_LDFLAGS =
-AM_CXXFLAGS = -Wall -funroll-loops
+AM_CXXFLAGS =
AM_ETAGSFLAGS = --extra=fq
rs_flocks_SOURCES = $(COMMON) $(COLOR) $(VECTOR) bug.cc bug.hh flocks.cc \
flocks.hh
diff -Naur xbmc-9.11-8.3/xbmc/screensavers/rsxs-0.9/src/flux/Makefile.in xbmc-9.11-8.4/xbmc/screensavers/rsxs-0.9/src/flux/Makefile.in
--- xbmc-9.11-8.3/xbmc/screensavers/rsxs-0.9/src/flux/Makefile.in 2009-01-24 23:51:01.000000000 +0100
+++ xbmc-9.11-8.4/xbmc/screensavers/rsxs-0.9/src/flux/Makefile.in 2010-01-24 06:03:38.000000000 +0100
@@ -277,7 +277,7 @@
@DLOPEN_TRUE@LIBLTDL_CPPFLAGS = -I$(top_builddir)/libltdl
AM_CPPFLAGS = -DPKGDATADIR=\"$(pkgdatadir)\" -I$(srcdir)/.. -I$(top_srcdir)/lib $(X_CPPFLAGS)
AM_LDFLAGS =
-AM_CXXFLAGS = -Wall -funroll-loops
+AM_CXXFLAGS =
AM_ETAGSFLAGS = --extra=fq
rs_flux_SOURCES = $(COMMON) $(COLOR) $(VECTOR) flux.cc flux.hh trail.cc trail.hh
rs_flux_LDADD = $(LIBMISC) $(X_LIBS) $(OPENGL_LIBS)
diff -Naur xbmc-9.11-8.3/xbmc/screensavers/rsxs-0.9/src/helios/Makefile.in xbmc-9.11-8.4/xbmc/screensavers/rsxs-0.9/src/helios/Makefile.in
--- xbmc-9.11-8.3/xbmc/screensavers/rsxs-0.9/src/helios/Makefile.in 2009-01-24 23:51:01.000000000 +0100
+++ xbmc-9.11-8.4/xbmc/screensavers/rsxs-0.9/src/helios/Makefile.in 2010-01-24 06:03:38.000000000 +0100
@@ -290,7 +290,7 @@
AM_CPPFLAGS = -DPKGDATADIR=\"$(pkgdatadir)\" -I$(srcdir)/.. \
-I$(top_srcdir)/lib $(X_CPPFLAGS) $(IMAGE_CPPFLAGS)
AM_LDFLAGS = $(IMAGE_LDFLAGS)
-AM_CXXFLAGS = -Wall -funroll-loops $(IMAGE_CXXFLAGS)
+AM_CXXFLAGS = $(IMAGE_CXXFLAGS)
AM_ETAGSFLAGS = --extra=fq
rs_helios_SOURCES = $(COMMON) $(COLOR) $(VECTOR) $(IMAGE) $(IMPLICIT) \
helios.cc helios.hh particle.cc particle.hh sphere.hh
diff -Naur xbmc-9.11-8.3/xbmc/screensavers/rsxs-0.9/src/hyperspace/Makefile.in xbmc-9.11-8.4/xbmc/screensavers/rsxs-0.9/src/hyperspace/Makefile.in
--- xbmc-9.11-8.3/xbmc/screensavers/rsxs-0.9/src/hyperspace/Makefile.in 2009-01-24 23:51:01.000000000 +0100
+++ xbmc-9.11-8.4/xbmc/screensavers/rsxs-0.9/src/hyperspace/Makefile.in 2010-01-24 06:03:38.000000000 +0100
@@ -295,7 +295,7 @@
AM_CPPFLAGS = -DPKGDATADIR=\"$(pkgdatadir)\" -I$(srcdir)/.. \
-I$(top_srcdir)/lib $(X_CPPFLAGS) $(IMAGE_CPPFLAGS)
AM_LDFLAGS = $(IMAGE_LDFLAGS)
-AM_CXXFLAGS = -Wall -funroll-loops $(IMAGE_CXXFLAGS)
+AM_CXXFLAGS = $(IMAGE_CXXFLAGS)
AM_ETAGSFLAGS = --extra=fq
rs_hyperspace_SOURCES = $(COMMON) $(COLOR) $(VECTOR) $(IMPLICIT) $(IMAGE) \
caustic.cc caustic.hh cubemaps.cc cubemaps.hh extensions.cc extensions.hh \
diff -Naur xbmc-9.11-8.3/xbmc/screensavers/rsxs-0.9/src/lattice/Makefile.in xbmc-9.11-8.4/xbmc/screensavers/rsxs-0.9/src/lattice/Makefile.in
--- xbmc-9.11-8.3/xbmc/screensavers/rsxs-0.9/src/lattice/Makefile.in 2009-01-24 23:51:01.000000000 +0100
+++ xbmc-9.11-8.4/xbmc/screensavers/rsxs-0.9/src/lattice/Makefile.in 2010-01-24 06:03:38.000000000 +0100
@@ -287,7 +287,7 @@
AM_CPPFLAGS = -DPKGDATADIR=\"$(pkgdatadir)\" -I$(srcdir)/.. \
-I$(top_srcdir)/lib $(X_CPPFLAGS) $(IMAGE_CPPFLAGS)
AM_LDFLAGS = $(IMAGE_LDFLAGS)
-AM_CXXFLAGS = -Wall -funroll-loops $(IMAGE_CXXFLAGS)
+AM_CXXFLAGS = $(IMAGE_CXXFLAGS)
AM_ETAGSFLAGS = --extra=fq
rs_lattice_SOURCES = $(COMMON) $(VECTOR) $(IMAGE) camera.hh lattice.cc \
lattice.hh resources.cc resources.hh
diff -Naur xbmc-9.11-8.3/xbmc/screensavers/rsxs-0.9/src/Makefile.common xbmc-9.11-8.4/xbmc/screensavers/rsxs-0.9/src/Makefile.common
--- xbmc-9.11-8.3/xbmc/screensavers/rsxs-0.9/src/Makefile.common 2007-10-08 19:37:14.000000000 +0200
+++ xbmc-9.11-8.4/xbmc/screensavers/rsxs-0.9/src/Makefile.common 2010-01-24 06:03:38.000000000 +0100
@@ -18,7 +18,7 @@
AM_CPPFLAGS = -DPKGDATADIR=\"$(pkgdatadir)\" -I$(srcdir)/.. -I$(top_srcdir)/lib $(X_CPPFLAGS) -D_LINUX -DXBMC
AM_LDFLAGS =
-AM_CXXFLAGS = -Wall -funroll-loops
+AM_CXXFLAGS =
AM_ETAGSFLAGS = --extra=fq
diff -Naur xbmc-9.11-8.3/xbmc/screensavers/rsxs-0.9/src/plasma/Makefile.in xbmc-9.11-8.4/xbmc/screensavers/rsxs-0.9/src/plasma/Makefile.in
--- xbmc-9.11-8.3/xbmc/screensavers/rsxs-0.9/src/plasma/Makefile.in 2009-01-24 23:51:01.000000000 +0100
+++ xbmc-9.11-8.4/xbmc/screensavers/rsxs-0.9/src/plasma/Makefile.in 2010-01-24 06:03:38.000000000 +0100
@@ -274,7 +274,7 @@
@DLOPEN_TRUE@LIBLTDL_CPPFLAGS = -I$(top_builddir)/libltdl
AM_CPPFLAGS = -DPKGDATADIR=\"$(pkgdatadir)\" -I$(srcdir)/.. -I$(top_srcdir)/lib $(X_CPPFLAGS)
AM_LDFLAGS =
-AM_CXXFLAGS = -Wall -funroll-loops
+AM_CXXFLAGS =
AM_ETAGSFLAGS = --extra=fq
rs_plasma_SOURCES = $(COMMON) plasma.cc plasma.hh
rs_plasma_LDADD = $(LIBMISC) $(X_LIBS) $(OPENGL_LIBS)
diff -Naur xbmc-9.11-8.3/xbmc/screensavers/rsxs-0.9/src/skyrocket/Makefile.in xbmc-9.11-8.4/xbmc/screensavers/rsxs-0.9/src/skyrocket/Makefile.in
--- xbmc-9.11-8.3/xbmc/screensavers/rsxs-0.9/src/skyrocket/Makefile.in 2009-01-24 23:51:01.000000000 +0100
+++ xbmc-9.11-8.4/xbmc/screensavers/rsxs-0.9/src/skyrocket/Makefile.in 2010-01-24 06:03:38.000000000 +0100
@@ -310,7 +310,7 @@
-I$(top_srcdir)/lib $(X_CPPFLAGS) $(LIBLTDL_CPPFLAGS) \
$(IMAGE_CPPFLAGS) $(SOUND_CPPFLAGS)
AM_LDFLAGS = $(IMAGE_LDFLAGS) $(SOUND_LDFLAGS)
-AM_CXXFLAGS = -Wall -funroll-loops $(IMAGE_CXXFLAGS) $(SOUND_CXXFLAGS)
+AM_CXXFLAGS = $(IMAGE_CXXFLAGS) $(SOUND_CXXFLAGS)
AM_ETAGSFLAGS = --extra=fq
rs_skyrocket_SOURCES = $(COMMON) $(COLOR) $(VECTOR) $(IMAGE) $(SOUND) $(DLOPEN) \
bee.cc bee.hh bigmama.cc bigmama.hh bomb.cc bomb.hh explosion.cc \
diff -Naur xbmc-9.11-8.3/xbmc/screensavers/rsxs-0.9/src/solarwinds/Makefile.in xbmc-9.11-8.4/xbmc/screensavers/rsxs-0.9/src/solarwinds/Makefile.in
--- xbmc-9.11-8.3/xbmc/screensavers/rsxs-0.9/src/solarwinds/Makefile.in 2009-01-24 23:51:01.000000000 +0100
+++ xbmc-9.11-8.4/xbmc/screensavers/rsxs-0.9/src/solarwinds/Makefile.in 2010-01-24 06:03:38.000000000 +0100
@@ -277,7 +277,7 @@
@DLOPEN_TRUE@LIBLTDL_CPPFLAGS = -I$(top_builddir)/libltdl
AM_CPPFLAGS = -DPKGDATADIR=\"$(pkgdatadir)\" -I$(srcdir)/.. -I$(top_srcdir)/lib $(X_CPPFLAGS)
AM_LDFLAGS =
-AM_CXXFLAGS = -Wall -funroll-loops
+AM_CXXFLAGS =
AM_ETAGSFLAGS = --extra=fq
rs_solarwinds_SOURCES = $(COMMON) $(COLOR) $(VECTOR) solarwinds.cc \
solarwinds.hh wind.cc wind.hh
xbmc-9.11-spyce.diff:
spyce.py | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
--- NEW FILE xbmc-9.11-spyce.diff ---
diff -Naur xbmc-9.11.orig/system/python/spyce/spyce.py xbmc-9.11/system/python/spyce/spyce.py
--- xbmc-9.11.orig/system/python/spyce/spyce.py 2008-12-31 05:41:27.000000000 +0100
+++ xbmc-9.11/system/python/spyce/spyce.py 2009-12-30 09:16:24.000000000 +0100
@@ -415,18 +415,18 @@
self._response = self._request = None
self._responseCallback = {}
self._moduleCallback = {}
- def _startModule(self, name, file=None, as=None, force=0):
+ def _startModule(self, name, file=None, name_as=None, force=0):
"Initialise module for current request."
- if as==None: as=name
- if force or not self._codeenv.has_key(as):
+ if name_as==None: name_as=name
+ if force or not self._codeenv.has_key(name_as):
modclass = getServer().loadModule(name, file, self._spycecode.getFilename())
mod = modclass(self._api)
- self.setModule(as, mod, 0)
+ self.setModule(name_as, mod, 0)
if DEBUG_ERROR:
- sys.stderr.write(as+'.start\n')
+ sys.stderr.write(name_as+'.start\n')
mod.start()
- self._modstarted.append((as, mod))
- else: mod = self._codeenv[as]
+ self._modstarted.append((name_as, mod))
+ else: mod = self._codeenv[name_as]
return mod
# spyce processing
def spyceInit(self, request, response):
@@ -459,10 +459,10 @@
exec '_spyce_finish()' in { '_spyce_finish': self.destroy }
# explicit modules
self._modstarted.reverse()
- for as, mod in self._modstarted:
+ for name_as, mod in self._modstarted:
try:
if DEBUG_ERROR:
- sys.stderr.write(as+'.finish\n')
+ sys.stderr.write(name_as+'.finish\n')
mod.finish(theError)
except spyceException.spyceDone: pass
except spyceException.spyceRedirect, e:
@@ -473,10 +473,10 @@
finishError = None
# default modules
self._modstarteddefault.reverse()
- for as, mod in self._modstarteddefault:
+ for name_as, mod in self._modstarteddefault:
try:
if DEBUG_ERROR:
- sys.stderr.write(as+'.finish\n')
+ sys.stderr.write(name_as+'.finish\n')
mod.finish(theError)
except: finishError = 1
self._request = None
xbmc-9.11-swscale.diff:
DllSwScale.h | 4 ++++
1 file changed, 4 insertions(+)
--- NEW FILE xbmc-9.11-swscale.diff ---
--- xbmc-9.11.orig/xbmc/cores/ffmpeg/DllSwScale.h 2009-09-15 12:19:19.000000000 +0200
+++ xbmc-9.11/xbmc/cores/ffmpeg/DllSwScale.h 2010-03-02 16:55:15.101967249 +0100
@@ -76,7 +76,11 @@
virtual int sws_scale(struct SwsContext *context, uint8_t* src[], int srcStride[], int srcSliceY,
int srcSliceH, uint8_t* dst[], int dstStride[])
+#if LIBSWSCALE_VERSION_INT >= 0x800
+ { return ::sws_scale(context, const_cast<const uint8_t**>(src), srcStride, srcSliceY, srcSliceH, dst, dstStride); }
+#else
{ return ::sws_scale(context, src, srcStride, srcSliceY, srcSliceH, dst, dstStride); }
+#endif
#if (! defined USE_EXTERNAL_FFMPEG)
virtual void sws_rgb2rgb_init(int flags) { ::sws_rgb2rgb_init(flags); }
#elif (defined HAVE_LIBSWSCALE_RGB2RGB_H) || (defined HAVE_FFMPEG_RGB2RGB_H)
xbmc-9.11-use_cdio_system_headers_on_non_win32.patch:
b/xbmc/Application.cpp | 4 ++++
b/xbmc/FileSystem/cdioSupport.cpp | 2 +-
b/xbmc/FileSystem/iso9660.cpp | 2 +-
b/xbmc/Makefile | 2 --
b/xbmc/cdrip/CDDAReader.cpp | 4 ++++
b/xbmc/cores/paplayer/AC3CDDACodec.cpp | 4 ++++
b/xbmc/cores/paplayer/CDDAcodec.cpp | 4 ++++
b/xbmc/cores/paplayer/DTSCDDACodec.cpp | 4 ++++
xbmc-9.11/xbmc/FileSystem/Makefile | 1 -
9 files changed, 22 insertions(+), 5 deletions(-)
--- NEW FILE xbmc-9.11-use_cdio_system_headers_on_non_win32.patch ---
--- xbmc-9.11/xbmc/FileSystem/Makefile.orig 2009-10-10 15:00:16.000000000 +0200
+++ xbmc-9.11/xbmc/FileSystem/Makefile 2009-12-29 14:42:11.568652874 +0100
@@ -1,5 +1,4 @@
INCLUDES=-I. -I../ -I../cores -I../linux -I../../guilib -I../lib/UnrarXLib -I../utils -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include
-INCLUDES+=-I../lib/libcdio/libcdio/include
CXXFLAGS+=-D__STDC_FORMAT_MACROS \
diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp
index 9097519..9b6418d 100644
--- a/xbmc/Application.cpp
+++ b/xbmc/Application.cpp
@@ -236,7 +236,11 @@
#endif
#ifdef HAS_DVD_DRIVE
+#ifdef _WIN32
#include "lib/libcdio/logging.h"
+#else
+#include <cdio/logging.h>
+#endif
#endif
#ifdef HAS_HAL
diff --git a/xbmc/FileSystem/cdioSupport.cpp b/xbmc/FileSystem/cdioSupport.cpp
index 00e5fdd..21a0b67 100644
--- a/xbmc/FileSystem/cdioSupport.cpp
+++ b/xbmc/FileSystem/cdioSupport.cpp
@@ -26,7 +26,7 @@
#include "cdioSupport.h"
#include "utils/SingleLock.h"
#include "utils/log.h"
-#ifndef _LINUX
+#ifdef _WIN32
#include "lib/libcdio/logging.h"
#include "lib/libcdio/util.h"
#include "lib/libcdio/mmc.h"
diff --git a/xbmc/FileSystem/iso9660.cpp b/xbmc/FileSystem/iso9660.cpp
index 6e1633f..58fbc50 100644
--- a/xbmc/FileSystem/iso9660.cpp
+++ b/xbmc/FileSystem/iso9660.cpp
@@ -44,7 +44,7 @@ ISO9660
#include "utils/CharsetConverter.h"
#include "DetectDVDType.h" // for MODE2_DATA_SIZE etc.
-#ifdef _LINUX
+#ifndef _WIN32
#include <cdio/bytesex.h>
#else
#include "lib/libcdio/bytesex.h" // for from_723 & from_733
diff --git a/xbmc/Makefile b/xbmc/Makefile
index abfbdcb..f55381a 100644
--- a/xbmc/Makefile
+++ b/xbmc/Makefile
@@ -8,8 +8,6 @@ INCLUDES+=-Ilib/libUPnP/Platinum/Source/Core \
-Ilib/libUPnP/Neptune/Source/System/Posix \
-Ilib/libUPnP/Neptune/Source/Core
-INCLUDES+=-Ilib/libcdio/libcdio/include
-
SRCS=Application.cpp \
CueDocument.cpp \
GUISettings.cpp \
diff --git a/xbmc/cdrip/CDDAReader.cpp b/xbmc/cdrip/CDDAReader.cpp
index c8b37b2..e3e9c0b 100644
--- a/xbmc/cdrip/CDDAReader.cpp
+++ b/xbmc/cdrip/CDDAReader.cpp
@@ -24,7 +24,11 @@
#ifdef HAS_CDDA_RIPPER
#include "CDDAReader.h"
+#ifdef _WIN32
#include "lib/libcdio/cdio.h"
+#else
+#include <cdio/cdio.h>
+#endif
#include "utils/log.h"
#define SECTOR_COUNT 52
diff --git a/xbmc/cores/paplayer/AC3CDDACodec.cpp b/xbmc/cores/paplayer/AC3CDDACodec.cpp
index 20cded7..f2a077a 100644
--- a/xbmc/cores/paplayer/AC3CDDACodec.cpp
+++ b/xbmc/cores/paplayer/AC3CDDACodec.cpp
@@ -22,7 +22,11 @@
#include "system.h"
#include "AC3CDDACodec.h"
#ifdef HAS_AC3_CDDA_CODEC
+#ifdef _WIN32
#include "lib/libcdio/sector.h"
+#else
+#include <cdio/sector.h>
+#endif
AC3CDDACodec::AC3CDDACodec() : AC3Codec()
{
diff --git a/xbmc/cores/paplayer/CDDAcodec.cpp b/xbmc/cores/paplayer/CDDAcodec.cpp
index ca8f1be..42460dc 100644
--- a/xbmc/cores/paplayer/CDDAcodec.cpp
+++ b/xbmc/cores/paplayer/CDDAcodec.cpp
@@ -20,7 +20,11 @@
*/
#include "CDDAcodec.h"
+#ifdef _WIN32
#include "lib/libcdio/sector.h"
+#else
+#include <cdio/sector.h>
+#endif
#define SECTOR_COUNT 55 // max. sectors that can be read at once
#define MAX_BUFFER_SIZE 2*SECTOR_COUNT*CDIO_CD_FRAMESIZE_RAW
diff --git a/xbmc/cores/paplayer/DTSCDDACodec.cpp b/xbmc/cores/paplayer/DTSCDDACodec.cpp
index e64cc2e..9bc46c6 100644
--- a/xbmc/cores/paplayer/DTSCDDACodec.cpp
+++ b/xbmc/cores/paplayer/DTSCDDACodec.cpp
@@ -22,7 +22,11 @@
#include "system.h"
#include "DTSCDDACodec.h"
#ifdef HAS_DTS_CODEC
+#ifdef _WIN32
#include "lib/libcdio/sector.h"
+#else
+#include <cdio/sector.h>
+#endif
DTSCDDACodec::DTSCDDACodec() : DTSCodec()
{
xbmc-9.11-xbmc.sh.diff:
xbmc.sh.in | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
--- NEW FILE xbmc-9.11-xbmc.sh.diff ---
--- xbmc-9.11.orig/tools/Linux/xbmc.sh.in 2009-12-06 11:44:24.000000000 +0100
+++ xbmc-9.11/tools/Linux/xbmc.sh.in 2010-01-20 17:26:39.000000000 +0100
@@ -5,7 +5,7 @@
find $1 -maxdepth $2 -name 'core*' -exec \
echo "=====> Core file: {}" 2> /dev/null >> $FILE \; -exec \
echo " ========================================= " 2> /dev/null >> $FILE \; -exec \
- gdb /usr/share/xbmc/xbmc.bin --core={} --batch -ex "thread apply all bt" 2> /dev/null >> $FILE \; -exec \
+ /usr/bin/gdb @libdir(a)/xbmc/xbmc.bin --core={} --batch -ex "thread apply all bt" 2> /dev/null >> $FILE \; -exec \
rm -f {} \;
}
@@ -37,7 +37,7 @@
if [ $XBMC_HOME ]; then
BASEDIR=$XBMC_HOME
else
- BASEDIR=@prefix@/share/xbmc/
+ BASEDIR=@libdir@/xbmc/
fi
single_stacktrace $BASEDIR 5
# find in user xbmc dir
@@ -63,11 +63,13 @@
}
# Set XBMC_HOME if xbmc.bin is a symlink
-if [ -L @prefix(a)/share/xbmc/xbmc.bin ]; then
- export XBMC_HOME="@prefix@/share/xbmc"
+if [ -L @libdir(a)/xbmc/xbmc.bin ]; then
+ export XBMC_HOME="@libdir@/xbmc"
fi
-python @prefix(a)/share/xbmc/FEH.py "$@"
+# export XBMC_HOME=@libdir@/xbmc
+
+python @libdir(a)/xbmc/FEH.py "$@"
if [ $? -ne 0 ]; then
exit
fi
@@ -76,7 +78,7 @@
while (( $LOOP ))
do
LOOP=0
- @prefix(a)/share/xbmc/xbmc.bin "$@"
+ @libdir(a)/xbmc/xbmc.bin "$@"
RET=$?
if (( $RET == 65 ))
then
xbmc-9.11-xext.diff:
configure.in | 3 +++
1 file changed, 3 insertions(+)
--- NEW FILE xbmc-9.11-xext.diff ---
--- xbmc-9.11.orig/configure.in 2010-03-02 04:27:24.000000000 +0100
+++ xbmc-9.11/configure.in 2010-03-02 17:00:29.000000000 +0100
@@ -402,6 +402,9 @@
PKG_CHECK_MODULES([XT], [xt],
[INCLUDES+=" $XT_CFLAGS"; LIBS+=" $XT_LIBS"],
AC_MSG_ERROR($missing_library))
+ PKG_CHECK_MODULES([XEXT], [xext],
+ [INCLUDES+=" $XEXT_CFLAGS"; LIBS+=" $XEXT_LIBS"],
+ AC_MSG_ERROR($missing_library))
PKG_CHECK_MODULES([XTST], [xtst],
[INCLUDES+=" $XTST_CFLAGS"; LIBS+=" $XTST_LIBS"],
AC_MSG_ERROR($missing_library))
--- NEW FILE xbmc-generate-tarball-xz.sh ---
#!/bin/sh
VERSION=${1-9.11}
tar -xzvf xbmc-$VERSION.tar.gz
cd xbmc-$VERSION
# remove bundled libraries (including zlib and OSX), saves space and forces using external versions
# also remove legally problematic libGoAhead library
for i in libass libcdio libCDRip libcurl libenca libfribidi liblzo libmms libpcre libsamplerate sqLite/sqlite libPython/Python cximage-6.0/zlib libid3tag/zlib zlib libSDL-OSX boost libportaudio libglew libGoAhead libhdhomerun
do
rm -r xbmc/lib/$i
done
# bundled win32 binaries
rm -r xbmc/visualizations/XBMCProjectM/win32
# remove various headers
rm xbmc/FileSystem/zlib.h
# remove more bundled codecs
# libfaad2, libmad needs upstream patches to be able to remove from tarball
# even though the bundled libaries aren't, I think, compiled
for i in ffmpeg liba52 libmpeg2 libdts
do
rm -r xbmc/cores/dvdplayer/Codecs/$i
done
# remove DVD stuff we can't ship, or is already in external libraries
for i in libdvdcss libdvdread includes
do
rm -r xbmc/cores/dvdplayer/Codecs/libdvd/$i
done
# remove all prebuilt binaries (e.g., .so files and Win32 DLLs)
find \( -name '*.so' -o -name '*.DLL' -o -name '*.dll' -o -name '*.lib' -o -name '*.zlib' -o -name '*.obj' -o -name '*.exe' -o -name '*.vis' \) | xargs rm -f
# remove other packages that should be system-wide
rm -rf lib
cd -
# repack
tar -cJvf xbmc-$VERSION-patched.tar.xz xbmc-$VERSION
--- NEW FILE xbmc.spec ---
Name: xbmc
Version: 9.11
Release: 16%{?dist}
URL: http://www.xbmc.org/
Source0: %{name}-%{version}-patched.tar.xz
# xbmc contains code that we cannot ship, as well as redundant private
# copies of upstream libraries that we already distribute. Therefore
# we use this script to remove the code before shipping it.
# Download the upstream tarball from:
# http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
# and invoke this script while in the directory where the tarball is located:
# ./xbmc-generate-tarball-xz.sh <version>
# where <version> is the particular version being used
Source1: xbmc-generate-tarball-xz.sh
# look for libdca, rather than libdts
# http://xbmc.org/trac/ticket/8040
Patch1: xbmc-9.11-libdca.patch
# Needs work before being submitted upstream
Patch2: xbmc-9.11-b1-dvdlibs-external.patch
# http://xbmc.org/trac/ticket/8026 (this will be in next release)
Patch3: xbmc-9.11-use_cdio_system_headers_on_non_win32.patch
# Next 3 patches to use %{_libdir}
# http://xbmc.org/trac/ticket/8590
Patch4: xbmc-9.11-fix-Makefile.in.patch
Patch5: xbmc-9.11-Makefile.include.in.diff
Patch6: xbmc-9.11-xbmc.sh.diff
# Next 2 patches submitted upstream
# http://www.xbmc.org/trac/ticket/8629
Patch7: xbmc-9.11-spyce.diff
Patch8: xbmc-9.11-RandomNumberGenerators.hpp.diff
# Needs work before being submitted upstream
Patch9: xbmc-9.11-remlibass.patch
# Fixes GCC warning: partial backport to 9.11
# (should be fixed in next release)
Patch10: xbmc-9.11-changeset-26191.diff
# remove goahead completely from compilation, it's been replaced
# by libmicrohttpd in SVN, so should add that BuildRequires for 10.5
# and drop this patch
Patch11: xbmc-9.11-remove-goahead.patch
# Next 12 patches submitted upstream:
# http://www.xbmc.org/trac/ticket/8629
Patch12: xbmc-9.11-external-zlib.diff
Patch13: xbmc-9.11-goom-missing.diff
Patch14: xbmc-9.11-rsxs-0.9.diff
Patch15: xbmc-9.11-Weather.diff
Patch16: xbmc-9.11-XBMCProjectM-cmake.diff
Patch17: xbmc-9.11-cflags.patch
Patch18: xbmc-9.11-configure.patch
Patch19: xbmc-9.11-gymcodec.patch
Patch20: xbmc-9.11-macdll.patch
Patch21: xbmc-9.11-maclib.patch
Patch22: xbmc-9.11-libid3tag.patch
Patch23: xbmc-9.11-librtv.patch
# these next 2 are (hopefully temporary) hacks
Patch24: xbmc-9.11-swscale.diff
Patch25: xbmc-9.11-xext.diff
# an attempt to force hdhomerun to be external
Patch26: xbmc-9.11-hdhomerun.patch
Buildroot: %{_tmppath}/%{name}-%{version}
Summary: Media center
License: GPLv2+
Group: Applications/Multimedia
BuildRequires: desktop-file-utils
BuildRequires: SDL-devel
BuildRequires: SDL_image-devel
BuildRequires: SDL_mixer-devel
BuildRequires: fontconfig-devel
BuildRequires: fribidi-devel
BuildRequires: glibc-devel
BuildRequires: hal-devel
BuildRequires: glew-devel
BuildRequires: libstdc++-devel
BuildRequires: glib2-devel
BuildRequires: libjasper-devel
BuildRequires: libjpeg-devel
BuildRequires: libogg-devel
BuildRequires: libpng-devel
BuildRequires: libstdc++-devel
BuildRequires: e2fsprogs-devel
BuildRequires: libvorbis-devel
BuildRequires: lzo-devel
BuildRequires: pcre-devel
BuildRequires: zlib-devel
BuildRequires: tre-devel
BuildRequires: boost-devel
BuildRequires: bzip2-devel
BuildRequires: freetype-devel
BuildRequires: libXinerama-devel
BuildRequires: fontconfig-devel
BuildRequires: mysql-devel
BuildRequires: jasper-devel
BuildRequires: enca-devel
BuildRequires: cmake
BuildRequires: gperf
BuildRequires: nasm
BuildRequires: libXmu-devel
BuildRequires: pcre-devel
BuildRequires: gcc-c++
BuildRequires: sqlite-devel
BuildRequires: curl-devel
BuildRequires: libcdio-devel
BuildRequires: flex
BuildRequires: libmad-devel
BuildRequires: libsamplerate-devel
BuildRequires: libsmbclient-devel
BuildRequires: libmms-devel
BuildRequires: libXtst-devel
BuildRequires: libvdpau-devel
BuildRequires: desktop-file-utils
BuildRequires: python-devel
BuildRequires: wavpack-devel
BuildRequires: a52dec-devel
BuildRequires: libmpeg2-devel
BuildRequires: libmpcdec-devel
BuildRequires: flac-devel
BuildRequires: avahi-devel
BuildRequires: libtool
BuildRequires: libtiff-devel
BuildRequires: libvdpau-devel
BuildRequires: libdvdread-devel
BuildRequires: ffmpeg-devel
BuildRequires: faad2-devel
BuildRequires: pulseaudio-libs-devel
BuildRequires: libdca-devel
BuildRequires: libass-devel >= 0.9.7
BuildRequires: hdhomerun-devel
# add following BR in next release of XBMC to get support for crystalhd devices
#BuildRequires: libcrystalhd-devel
%description
XBMC media center is a free cross-platform media-player jukebox and
entertainment hub. XBMC can play a spectrum of of multimedia formats,
and featuring playlist, audio visualizations, slideshow, and weather
forecast functions, together third-party plugins.
%prep
%setup -q -n %{name}-%{version}
%patch1 -p1 -b .dtsdca
%patch2 -p1 -b .dvdlibs
%patch3 -p1 -b .cdio
%patch4 -p0 -b .makefilein
%patch5 -p1 -b .makefileincl
%patch6 -p1 -b .xbmcsh
%patch7 -p1
%patch8 -p1 -b .rand
%patch9 -p1 -b .remlibass
%patch10 -p1 -b .gccwarning
%patch11 -p0 -b .removegoahead
%patch12 -p1 -b .zlib
%patch13 -p1 -b .goom
%patch14 -p1 -b .rsxs
%patch15 -p1 -b .weather
%patch16 -p1 -b .projectm
%patch17 -p1 -b .cflags
%patch18 -p1
%patch19 -p1
%patch20 -p1
%patch21 -p1
%patch22 -p1
%patch23 -p1
%patch24 -p1
%patch25 -p1
%patch26 -p1 -b .hdhomerun
# Prevent rerunning the autotools.
touch -r xbmc/screensavers/rsxs-0.9/aclocal.m4 \
$(find xbmc/screensavers/rsxs-0.9 \( -name 'configure.*' -o -name 'Makefile.*' \))
%build
chmod +x bootstrap
./bootstrap
# Can't use export nor %%configure (implies using export), because
# the Makefile pile up *FLAGS in this case.
./configure \
--prefix=%{_prefix} --bindir=%{_bindir} --includedir=%{_includedir} \
--libdir=%{_libdir} --datadir=%{_datadir} \
--enable-external-libraries --enable-goom \
--disable-optimizations --disable-debug \
--disable-webserver \
SVN_REV=26017 \
CPPFLAGS="-I/usr/include/ffmpeg" \
CFLAGS="$RPM_OPT_FLAGS -fPIC -I/usr/include/ffmpeg" \
CXXFLAGS="$RPM_OPT_FLAGS -fPIC -I/usr/include/ffmpeg" \
LDFLAGS="-fPIC" \
LIBS="-L%{_libdir}/mysql -lhdhomerun $LIBS" \
ASFLAGS=-fPIC
make %{?_smp_mflags} VERBOSE=1
%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install
# remove the doc files from libdir, they should be put in the docdir
rm $RPM_BUILD_ROOT/%{_libdir}/xbmc/copying.txt $RPM_BUILD_ROOT/%{_libdir}/xbmc/keymapping.txt $RPM_BUILD_ROOT/%{_libdir}/xbmc/LICENSE.GPL $RPM_BUILD_ROOT/%{_libdir}/xbmc/README.linux
# remove bogus header file
rm -f $RPM_BUILD_ROOT%{_libdir}/xbmc/visualisations/xbmc_vis.h
# make Python files executable to keep rpmlint quiet
# (spyce to be dropped from next xbmc release, so this can be dropped then)
for i in run_spyceCGI.py run_spyceCmd.py run_spyceModpy.py spyceCGI.py spyceCmd.py spyce.py verchk.py
do
chmod +x $RPM_BUILD_ROOT%{_libdir}/xbmc/system/python/spyce/$i
done
desktop-file-install \
--dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
$RPM_BUILD_ROOT%{_datadir}/applications/xbmc.desktop
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root)
%doc copying.txt keymapping.txt LICENSE.GPL README.linux
%{_bindir}/xbmc
%{_bindir}/xbmc-standalone
%{_libdir}/xbmc
%{_datadir}/xsessions/XBMC.desktop
%{_datadir}/applications/xbmc.desktop
%{_datadir}/pixmaps/xbmc.png
%changelog
* Wed Mar 24 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 9.11-16
- Add BuildRequires: hdhomerun-devel
* Sun Mar 7 2010 Rolf Fokkens <rolf fokkens[AT]wanadoo nl> - 9.11-15
- Add patch for force using hdhomerun external, had to create a
hdhomerun-devel package first
* Sat Mar 6 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 9.11-14
- Add patch that removes all webserver GoAhead functionality due to
problematic license
- Drop BR: faac-devel since it was moved to nonfree
* Fri Mar 5 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 9.11-13
- Patches to add -lXext to LIBS (thanks Ralf Corsepius)
- Hack to work around ffmpeg sws_scale() incompatibility (thanks Ralf)
- Remove bundled boost, libportaudio, libglew and extra unused zlib
header from tarball
- Call desktop-file-install as per review guidelines
- Make spyce files executable, quiets rpmlint
* Mon Feb 8 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 9.11-12
- More patches from Ralf Corsepius
- Update configure line, specify *FLAGS directly in configure line
(thanks Ralf)
- Touch rsxs Makefiles to prevent rerunning the autotools (thanks Ralf)
- Add missing %%clean (thanks Ralf)
- Remove even more unused library copies in generate tarball script
* Tue Jan 26 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 9.11-11
- Add another patch to ensure Makefile's pass compiler flags properly
(thanks Ralf C)
- Remove commands no longer needed in install
* Mon Jan 25 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 9.11-10
- Patches for RPM_OPT_FLAGS being recognised throughout (thanks
Ralf C)
- Patch for goom (Ralf C)
- Patch for using external zlib (Ralf C)
- Pass CPPFLAGS to configure (Ralf C)
* Thu Jan 21 2010 Rolf Fokkens <rolf fokkens[AT]wanadoo nl> - 9.11-9
- increase compression ratio of tarball by compressing with cx
the src.rpm is now about 20% smaller
- remove patch0 and patch1, they are obsolete now
- rename patch2 and patch10 to more meaningful name
* Thu Jan 21 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 9.11-8
- Update xbmc script patch (thanks Ralf C)
- Reorder patches, add upstream tickets where possible
- Drop SVN_REV from line until exact version clarified
* Mon Jan 18 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 9.11-7
- Remove bundled copies of libraries, and code that we can't
distribute from upstream tarball with script
- Drop patch against ffmpeg which we removed from tarball
- Trim description
* Sun Jan 17 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 9.11-6
- Add patch for web server segfaults on 64-bit (thanks Ralf Corsepius)
- Drop patch backup for .spyce, causes packaging problems (thanks Ralf
Corsepius)
- Remove bogus header from install (thanks Ralf Corsepius)
- More comprehensive pre-built Win32 binary removal (thanks Ralf
Corsepius)
- Add SVN_REV to configure line for plugins (thanks Graeme Gillies)
* Tue Jan 5 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 9.11-5
- Remove unnecessary BR: mysql-libs
- Prune out unneeded stuff from build (thanks Rolf Fokkens)
- Remove libraries not compiled (thanks Rolf Fokkens)
- Patch to some nasty GCC warnings (thanks Ralf Corsepius)
* Thu Dec 31 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 9.11-4
- Patches to fix installation paths to /usr/lib/ (thanks Ralf Corsepius)
- Patch to fix other issues: random number library (thanks Ralf Corsepius)
* Wed Dec 30 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 9.11-3
- Cleanup spec for submission to RPM Fusion
- Fix changelog entries to use standard numbering to quiet rpmlint
- Use standard URL for sourceforge tarballs
- Add BR: pulseaudio-libs-devel and others
- Add patch that removes comments in rules in Makefile.in that
prevented install target working
* Tue Dec 29 2009 Rolf Fokkens <rolf fokkens wanadoo nl> - 9.11-2
- use external libcdio again, patch by MaestroDD
* Fri Dec 25 2009 Rolf Fokkens <rolf fokkens wanadoo nl> - 9.11-1
- Update to 9.11
* Fri Dec 18 2009 Rolf Fokkens <rolf fokkens wanadoo nl> - 9.11-0.5.rc1
- Update to 9.11 rc1
* Fri Dec 11 2009 Rolf Fokkens <rolf fokkens wanadoo nl> - 9.11-0.4.beta2
- Update to 9.11 beta2
* Tue Dec 1 2009 Rolf Fokkens <rolf fokkens wanadoo nl> - 9.11-0.3.beta1
- Force using external libdvdread and libdvdcss. libdvdnav is stil internal
as xbmc needs its internals.
* Sat Nov 28 2009 Rolf Fokkens <rolf fokkens wanadoo nl> - 9.11-0.2.beta1
- replaced dependency on libdts by libdca
- removed dependency on external libcdio, use included one instead
now detection of CD's and DVD's works again
- Compiles and runs on Fedora 11
- Update to 9.11 beta1
* Sun Nov 15 2009 Rolf Fokkens <rolf fokkens wanadoo nl> - 9.11-0.1.alpha2
- Compiles and runs on Fedora 11
- Update to 9.11 alpha2
* Fri May 15 2009 Scott Harvanek <scotth(a)login.com> - 9.04-1
- Update to 9.04
* Wed Jan 28 2009 Scott Harvanek <scotth(a)login.com> - 8.10-3
- Added requires for
- alsa-plugins-pulseaudio, libogg, libmad, libvorbis
* Fri Jan 2 2009 Scott Harvanek <scotth(a)login.com> - 8.10-2
- Patch for English language strings.xml
* Thu Nov 27 2008 Scott Harvanek <scotth(a)login.com> - 8.10-1
- v8.10
- Fedora 10 RPM
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/xbmc/F-13/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 26 Mar 2010 20:02:23 -0000 1.1
+++ .cvsignore 27 Mar 2010 00:28:42 -0000 1.2
@@ -0,0 +1 @@
+xbmc-9.11-patched.tar.xz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/xbmc/F-13/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 26 Mar 2010 20:02:23 -0000 1.1
+++ sources 27 Mar 2010 00:28:42 -0000 1.2
@@ -0,0 +1 @@
+c8c54a8839b289a97140f7f41acfedc4 xbmc-9.11-patched.tar.xz
14 years, 1 month
- 1
- 0
rpms/xbmc/F-12 xbmc.spec,1.2,1.3
by Alex Lancaster
Author: alexlan
Update of /cvs/free/rpms/xbmc/F-12
In directory se02.es.rpmfusion.net:/tmp/cvs-serv13105
Modified Files:
xbmc.spec
Log Message:
Exclude ppc64
Index: xbmc.spec
===================================================================
RCS file: /cvs/free/rpms/xbmc/F-12/xbmc.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xbmc.spec 26 Mar 2010 21:50:17 -0000 1.2
+++ xbmc.spec 27 Mar 2010 00:08:43 -0000 1.3
@@ -1,6 +1,6 @@
Name: xbmc
Version: 9.11
-Release: 17%{?dist}
+Release: 18%{?dist}
URL: http://www.xbmc.org/
Source0: %{name}-%{version}-patched.tar.xz
@@ -69,6 +69,7 @@
# an attempt to force hdhomerun to be external
Patch26: xbmc-9.11-hdhomerun.patch
+ExcludeArch: ppc64
Buildroot: %{_tmppath}/%{name}-%{version}
Summary: Media center
License: GPLv2+ and GPLv3+
@@ -236,6 +237,9 @@
%{_datadir}/pixmaps/xbmc.png
%changelog
+* Fri Mar 26 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 9.11-18
+- Exclude ppc64 (not available for F-13+ in any case)
+
* Fri Mar 26 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 9.11-17
- Fixed license tag to include GPLv3+
14 years, 1 month
- 1
- 0
rpms/xbmc/devel xbmc.spec,1.1,1.2
by Alex Lancaster
Author: alexlan
Update of /cvs/free/rpms/xbmc/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv10621
Modified Files:
xbmc.spec
Log Message:
* Fri Mar 26 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 9.11-18
- Exclude ppc64 (not available for F-13+ in any case)
* Fri Mar 26 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 9.11-17
- Fixed license tag to include GPLv3+
Index: xbmc.spec
===================================================================
RCS file: /cvs/free/rpms/xbmc/devel/xbmc.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xbmc.spec 26 Mar 2010 23:39:00 -0000 1.1
+++ xbmc.spec 26 Mar 2010 23:43:43 -0000 1.2
@@ -1,6 +1,6 @@
Name: xbmc
Version: 9.11
-Release: 16%{?dist}
+Release: 18%{?dist}
URL: http://www.xbmc.org/
Source0: %{name}-%{version}-patched.tar.xz
@@ -69,9 +69,10 @@
# an attempt to force hdhomerun to be external
Patch26: xbmc-9.11-hdhomerun.patch
+ExcludeArch: ppc64
Buildroot: %{_tmppath}/%{name}-%{version}
Summary: Media center
-License: GPLv2+
+License: GPLv2+ and GPLv3+
Group: Applications/Multimedia
BuildRequires: desktop-file-utils
BuildRequires: SDL-devel
@@ -236,6 +237,12 @@
%{_datadir}/pixmaps/xbmc.png
%changelog
+* Fri Mar 26 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 9.11-18
+- Exclude ppc64 (not available for F-13+ in any case)
+
+* Fri Mar 26 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 9.11-17
+- Fixed license tag to include GPLv3+
+
* Wed Mar 24 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 9.11-16
- Add BuildRequires: hdhomerun-devel
14 years, 1 month
- 1
- 0
rpms/xbmc/devel xbmc-9.11-Makefile.include.in.diff, NONE, 1.1 xbmc-9.11-RandomNumberGenerators.hpp.diff, NONE, 1.1 xbmc-9.11-Weather.diff, NONE, 1.1 xbmc-9.11-XBMCProjectM-cmake.diff, NONE, 1.1 xbmc-9.11-b1-dvdlibs-external.patch, NONE, 1.1 xbmc-9.11-cflags.patch, NONE, 1.1 xbmc-9.11-changeset-26191.diff, NONE, 1.1 xbmc-9.11-configure.patch, NONE, 1.1 xbmc-9.11-external-zlib.diff, NONE, 1.1 xbmc-9.11-fix-Makefile.in.patch, NONE, 1.1 xbmc-9.11-goom-missing.diff, NONE, 1.1 xbmc-9.11-gymcodec.patch, NONE, 1.1
by Alex Lancaster
Author: alexlan
Update of /cvs/free/rpms/xbmc/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv9525/devel
Modified Files:
.cvsignore sources
Added Files:
xbmc-9.11-Makefile.include.in.diff
xbmc-9.11-RandomNumberGenerators.hpp.diff
xbmc-9.11-Weather.diff xbmc-9.11-XBMCProjectM-cmake.diff
xbmc-9.11-b1-dvdlibs-external.patch xbmc-9.11-cflags.patch
xbmc-9.11-changeset-26191.diff xbmc-9.11-configure.patch
xbmc-9.11-external-zlib.diff xbmc-9.11-fix-Makefile.in.patch
xbmc-9.11-goom-missing.diff xbmc-9.11-gymcodec.patch
xbmc-9.11-hdhomerun.patch xbmc-9.11-libdca.patch
xbmc-9.11-libid3tag.patch xbmc-9.11-librtv.patch
xbmc-9.11-macdll.patch xbmc-9.11-maclib.patch
xbmc-9.11-remlibass.patch xbmc-9.11-remove-goahead.patch
xbmc-9.11-rsxs-0.9.diff xbmc-9.11-spyce.diff
xbmc-9.11-swscale.diff
xbmc-9.11-use_cdio_system_headers_on_non_win32.patch
xbmc-9.11-xbmc.sh.diff xbmc-9.11-xext.diff
xbmc-generate-tarball-xz.sh xbmc.spec
Log Message:
Initial import.
xbmc-9.11-Makefile.include.in.diff:
Makefile.include.in | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
--- NEW FILE xbmc-9.11-Makefile.include.in.diff ---
diff -Naur xbmc-9.11.orig/Makefile.include.in xbmc-9.11/Makefile.include.in
--- xbmc-9.11.orig/Makefile.include.in 2009-11-14 04:53:41.000000000 +0100
+++ xbmc-9.11/Makefile.include.in 2009-12-30 08:39:41.000000000 +0100
@@ -5,6 +5,8 @@
ARCH=@ARCH@
abs_top_srcdir=@abs_top_srcdir@
prefix=@prefix@
+bindir=@bindir@
+libdir=@libdir@
CXX=@CXX@
CC=@CC@
CXXFLAGS+=@CXXFLAGS@
@@ -18,7 +20,7 @@
-D_REENTRANT \
-D_LARGEFILE64_SOURCE \
-D_FILE_OFFSET_BITS=64 \
- -DINSTALL_PATH="\"@prefix@/share/xbmc\"" \
+ -DINSTALL_PATH="\"@libdir@/xbmc\"" \
@SDL_DEFINES@ \
@ARCH_DEFINES@ \
@DEFS@ \
xbmc-9.11-RandomNumberGenerators.hpp.diff:
RandomNumberGenerators.hpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE xbmc-9.11-RandomNumberGenerators.hpp.diff ---
diff -Naur xbmc-9.11.orig/xbmc/visualizations/XBMCProjectM/libprojectM/RandomNumberGenerators.hpp xbmc-9.11/xbmc/visualizations/XBMCProjectM/libprojectM/RandomNumberGenerators.hpp
--- xbmc-9.11.orig/xbmc/visualizations/XBMCProjectM/libprojectM/RandomNumberGenerators.hpp 2008-07-18 06:54:03.000000000 +0200
+++ xbmc-9.11/xbmc/visualizations/XBMCProjectM/libprojectM/RandomNumberGenerators.hpp 2009-12-31 11:57:53.000000000 +0100
@@ -85,7 +85,7 @@
// Sum up mass, stopping when cutoff is reached. This is the typical
// weighted sampling algorithm.
float mass = 0;
- for (std::size_t i = 0; i< weights.size() ; i) {
+ for (std::size_t i = 0; i< weights.size() ; i++) {
mass += weights[i];
if (mass >= cutoff)
return i;
xbmc-9.11-Weather.diff:
Weather.cpp | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
--- NEW FILE xbmc-9.11-Weather.diff ---
diff -Naur xbmc-9.11-8.2/xbmc/utils/Weather.cpp xbmc-9.11-8.3/xbmc/utils/Weather.cpp
--- xbmc-9.11-8.2/xbmc/utils/Weather.cpp 2009-11-12 08:41:55.000000000 +0100
+++ xbmc-9.11-8.3/xbmc/utils/Weather.cpp 2010-01-22 10:56:40.000000000 +0100
@@ -399,7 +399,7 @@
GetString(pOneDayElement, "low", iTmpStr, "");
if (iTmpStr == "N/A")
- m_info.forecast[i].m_high = "";
+ m_info.forecast[i].m_low = "";
else
{
CTemperature temp=CTemperature::CreateFromCelsius(atoi(iTmpStr));
@@ -417,8 +417,12 @@
m_info.forecast[i].m_icon.Format("%s128x128/na.png", WEATHER_BASE_PATH);
else
m_info.forecast[i].m_icon.Format("%s128x128/%s.png", WEATHER_BASE_PATH, iTmpStr);
-
- GetString(pDayTimeElement, "t", m_info.forecast[i].m_overview, "");
+
+ GetString(pDayTimeElement, "t", iTmpStr, ""); //string cause i've seen it return N/A
+ if (iTmpStr == "N/A")
+ m_info.forecast[i].m_overview = "";
+ else
+ m_info.forecast[i].m_overview = iTmpStr;
LocalizeOverview(m_info.forecast[i].m_overview);
}
xbmc-9.11-XBMCProjectM-cmake.diff:
configure.in | 8 +++++++-
xbmc/visualizations/XBMCProjectM/libprojectM/CMakeLists.txt | 2 +-
2 files changed, 8 insertions(+), 2 deletions(-)
--- NEW FILE xbmc-9.11-XBMCProjectM-cmake.diff ---
diff -Naur xbmc-9.11-8.4/configure.in xbmc-9.11-8.5/configure.in
--- xbmc-9.11-8.4/configure.in 2010-01-24 06:05:15.000000000 +0100
+++ xbmc-9.11-8.5/configure.in 2010-01-24 06:41:46.000000000 +0100
@@ -1329,7 +1329,13 @@
if test "$host_vendor" = "apple" ; then
rm -f CMakeCache.txt && CC="" CXX="" cmake -D CMAKE_C_FLAGS:STRING="-fno-common" -D CMAKE_CXX_FLAGS:STRING="-fno-common" -D CMAKE_BUILD_TYPE:STRING=RelWithDebInfo -D USE_FTGL:BOOL=OFF .
else
- rm -f CMakeCache.txt && CC="" CXX="" cmake -D CMAKE_BUILD_TYPE:STRING=RelWithDebInfo -D USE_FTGL:BOOL=OFF .
+set -x
+ rm -f CMakeCache.txt && cmake -DCMAKE_BUILD_TYPE=None -DUSE_FTGL:BOOL=OFF \
+ -DCMAKE_C_FLAGS="${CFLAGS}" -DCMAKE_CXX_FLAGS="${CXXFLAGS}" \
+ -DCMAKE_INSTALL_PREFIX="${prefix}" -DCMAKE_INSTALL_LIBDIR:PATH="${libdir}" \
+ -DINCLUDE_INSTALL_DIR:PATH="${includedir}" -DLIB_INSTALL_DIR:PATH="${_libdir}" \
+ -DSYSCONF_INSTALL_DIR:PATH="${sysconfdir}" -DSHARE_INSTALL_PREFIX:PATH="${datadir}" .
+set +x
fi
], [0])
diff -Naur xbmc-9.11-8.4/xbmc/visualizations/XBMCProjectM/libprojectM/CMakeLists.txt xbmc-9.11-8.5/xbmc/visualizations/XBMCProjectM/libprojectM/CMakeLists.txt
--- xbmc-9.11-8.4/xbmc/visualizations/XBMCProjectM/libprojectM/CMakeLists.txt 2009-12-08 04:05:05.000000000 +0100
+++ xbmc-9.11-8.5/xbmc/visualizations/XBMCProjectM/libprojectM/CMakeLists.txt 2010-01-24 06:41:46.000000000 +0100
@@ -116,7 +116,7 @@
ENDIF(FTGL_FOUND)
# todo: change this because its obscure and probably not being used
- set (FTGL_INCLUDE_DIRS "/opt/local/include")
+# set (FTGL_INCLUDE_DIRS "/opt/local/include")
set (FTGL_LINK_DIRS)
set (FTGL_LINK_TARGETS )
ENDIF(USE_FTGL)
xbmc-9.11-b1-dvdlibs-external.patch:
configure.in | 64 -------------------------
xbmc/cores/dvdplayer/Codecs/libdvd/Makefile.in | 9 +--
2 files changed, 5 insertions(+), 68 deletions(-)
--- NEW FILE xbmc-9.11-b1-dvdlibs-external.patch ---
--- xbmc-9.11-b1/configure.in.dvdlibs 2009-12-01 23:00:27.689755837 +0100
+++ xbmc-9.11-b1/configure.in 2009-12-01 23:13:34.449759740 +0100
@@ -37,8 +37,6 @@
pulse_disabled="== PulseAudio support manually disabled. =="
faac_not_found="== Could not find libfaac. FAAC support disabled. =="
faac_disabled="== FAAC support manually disabled. =="
-dvdcss_enabled="== DVDCSS support enabled. =="
-dvdcss_disabled="== DVDCSS support disabled. =="
avahi_not_found="== Could not find libavahi-common or libavahi-client. Avahi support disabled. =="
avahi_disabled="== Avahi support disabled. =="
vdpau_not_found="== Could not find libvdpau. VDPAU support disabled. =="
@@ -160,12 +158,6 @@
[use_faac=$enableval],
[use_faac=yes])
-AC_ARG_ENABLE([dvdcss],
- [AS_HELP_STRING([--enable-dvdcss],
- [enable DVDCSS support (default is yes)])],
- [use_dvdcss=$enableval],
- [use_dvdcss=yes])
-
AC_ARG_ENABLE([mid],
[AS_HELP_STRING([--enable-mid],
[enable MID support (default is no)])],
@@ -871,20 +863,6 @@
final_message="$final_message\n FAAC:\t\tNo"
fi
-# DVDCSS
-if test "$use_dvdcss" = "yes"; then
- AC_MSG_NOTICE($dvdcss_enabled)
- final_message="$final_message\n DVDCSS:\tYes"
- BUILD_DVDCSS=1
- SKIP_CONFIG_DVDCSS=0
- DVDREAD_CFLAGS="-D_XBMC -DHAVE_DVDCSS_DVDCSS_H"
-else
- AC_MSG_NOTICE($dvdcss_disabled)
- final_message="$final_message\n DVDCSS:\tNo"
- BUILD_DVDCSS=0
- SKIP_CONFIG_DVDCSS=1
- DVDREAD_CFLAGS="-D_XBMC -UHAVE_DVDCSS_DVDCSS_H"
-fi
if test "$use_avahi" = "yes"; then
final_message="$final_message\n Avahi:\tYes"
else
@@ -1214,44 +1192,6 @@
fi
], [$USE_EXTERNAL_LIBDTS])
-XB_CONFIG_MODULE([xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss], [
- if test "$host_vendor" = "apple" ; then
- ./configure MACOSX_DEPLOYMENT_TARGET=10.4 \
- CFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" \
- --disable-doc \
- --enable-static \
- --with-pic
- else
- ./configure \
- --disable-doc \
- --enable-static \
- --with-pic
- fi
-], [$SKIP_CONFIG_DVDCSS])
-
-XB_CONFIG_MODULE([xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread], [
- if test "$host_vendor" = "apple" ; then
- ./configure2 MACOSX_DEPLOYMENT_TARGET=10.4 \
- --extra-cflags="$DVDREAD_CFLAGS -D__DARWIN__ -fPIC -DPIC -fno-common -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4 -I`pwd`/../libdvdcss/src" \
- --enable-static \
- --disable-shared \
- --cc="$CC" &&
- make dvdread-config &&
- mkdir -p `pwd`/../includes/dvdread
- cp `pwd`/../libdvdread/src/*.h `pwd`/../includes/dvdread
- else
- ./configure2 \
- --extra-cflags="$DVDREAD_CFLAGS -fPIC -DPIC -I`pwd`/../libdvdcss/src" \
- --enable-static \
- --disable-shared \
- --cc="$CC" &&
- make dvdread-config &&
- mkdir -p `pwd`/../includes/dvdread
- cp `pwd`/../libdvdread/src/*.h `pwd`/../includes/dvdread
- fi
-
-], [0])
-
XB_CONFIG_MODULE([xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav], [
if test "$host_vendor" = "apple" ; then
./configure2 MACOSX_DEPLOYMENT_TARGET=10.4 \
@@ -1263,9 +1203,7 @@
--cc="$CC"
else
./configure2 \
- --extra-cflags="$DVDREAD_CFLAGS -fPIC -DPIC -I`pwd`/../includes" \
- --extra-ldflags="-L`pwd`/../libdvdread/obj" \
- --with-dvdread-config="`pwd`/../libdvdread/obj/dvdread-config" \
+ --extra-cflags="-D_XBMC -fPIC -DPIC" \
--enable-static \
--disable-shared \
--cc="$CC"
--- xbmc-9.11-b1/xbmc/cores/dvdplayer/Codecs/libdvd/Makefile.in.dvdlibs 2009-07-10 01:10:10.000000000 +0200
+++ xbmc-9.11-b1/xbmc/cores/dvdplayer/Codecs/libdvd/Makefile.in 2009-12-02 23:15:36.942762083 +0100
@@ -2,13 +2,12 @@
ARCH=@ARCH@
SYSDIR=../../../../../system/players/dvdplayer
SOS= libdvdnav-$(ARCH).so
-DIRS= libdvdread \
- libdvdnav
+DIRS= libdvdnav
WRAPPER=../../../DllLoader/exports/wrapper.o
WRAPPER_OSX=../../../../../tools/Mach5/wrapper.rb
-LDFLAGS=-shared -fPIC -rdynamic
+LDFLAGS=-shared -fPIC -rdynamic -ldvdread
ifeq ($(ARCH), powerpc-osx)
# Add -lbundle1.o for powerpc-osx
BUNDLE1_O = -lbundle1.o
@@ -53,8 +52,8 @@
libdvdcss/src/*.o \
`cat $(WRAPPER:.o=.def)` $(WRAPPER)
-$(SYSDIR)/libdvdnav-$(ARCH).so: $(WRAPPER) $(DVDCSS_A) libdvdread/obj/libdvdread.a libdvdnav/obj/libdvdnav.a
- $(CC) -o $@ $(LDFLAGS) --soname,$@ $(DVDCSS_O) libdvdread/obj/*.o libdvdnav/obj/*.o \
+$(SYSDIR)/libdvdnav-$(ARCH).so: $(WRAPPER) $(DVDCSS_A) libdvdnav/obj/libdvdnav.a
+ $(CC) -o $@ $(LDFLAGS) --soname,$@ $(DVDCSS_O) libdvdnav/obj/*.o \
`cat $(WRAPPER:.o=.def)` $(WRAPPER)
endif
xbmc-9.11-cflags.patch:
tools/TexturePacker/Makefile.in | 2 +-
xbmc/cores/dvdplayer/Codecs/libdvd/Makefile.in | 4 ++--
xbmc/cores/paplayer/AC3Codec/Makefile.in | 4 ++--
xbmc/cores/paplayer/ADPCMCodec/Makefile.in | 6 +++---
xbmc/cores/paplayer/FLACCodec/Makefile.in | 4 ++--
xbmc/cores/paplayer/GYMCodec/Makefile.in | 2 +-
xbmc/cores/paplayer/MACDll/Makefile.in | 2 +-
xbmc/cores/paplayer/ModuleCodec/Makefile.in | 2 +-
xbmc/cores/paplayer/NSFCodec/Makefile.in | 2 +-
xbmc/cores/paplayer/SIDCodec/Makefile.in | 2 +-
xbmc/cores/paplayer/SPCCodec/SNES/SNESAPU/Makefile.in | 6 +++---
xbmc/cores/paplayer/WavPackCodec/Makefile.in | 2 +-
xbmc/cores/paplayer/YMCodec/StSoundLibrary/Makefile.in | 2 +-
xbmc/cores/paplayer/timidity/Makefile.in | 4 ++--
xbmc/cores/paplayer/vgmstream/Makefile.in | 4 ++--
xbmc/cores/paplayer/vorbisfile/Makefile.in | 2 +-
xbmc/lib/libid3tag/Makefile.in | 2 +-
xbmc/visualizations/Goom/Makefile.in | 2 +-
xbmc/visualizations/XBMCProjectM/Makefile.in | 4 ++--
19 files changed, 29 insertions(+), 29 deletions(-)
--- NEW FILE xbmc-9.11-cflags.patch ---
diff -Naur xbmc-9.11-10.0/tools/TexturePacker/Makefile.in xbmc-9.11-10.1/tools/TexturePacker/Makefile.in
--- xbmc-9.11-10.0/tools/TexturePacker/Makefile.in 2009-10-04 05:55:21.000000000 +0200
+++ xbmc-9.11-10.1/tools/TexturePacker/Makefile.in 2010-01-26 05:14:09.000000000 +0100
@@ -21,4 +21,4 @@
include ../../Makefile.include
$(TARGET): $(OBJS)
- $(CXX) $(OBJS) $(LDFLAGS) $(LIBS) -o $(TARGET)
+ $(CXX) $(CXXFLAGS) $(OBJS) $(LDFLAGS) $(LIBS) -o $(TARGET)
diff -Naur xbmc-9.11-10.0/xbmc/cores/dvdplayer/Codecs/libdvd/Makefile.in xbmc-9.11-10.1/xbmc/cores/dvdplayer/Codecs/libdvd/Makefile.in
--- xbmc-9.11-10.0/xbmc/cores/dvdplayer/Codecs/libdvd/Makefile.in 2010-01-25 14:29:23.000000000 +0100
+++ xbmc-9.11-10.1/xbmc/cores/dvdplayer/Codecs/libdvd/Makefile.in 2010-01-26 05:14:09.000000000 +0100
@@ -48,12 +48,12 @@
else
$(SYSDIR)/libdvdcss-$(ARCH).so: $(WRAPPER) libdvdcss/src/.libs/libdvdcss.a
- $(CC) -o $@ $(LDFLAGS) --soname,$@ \
+ $(CC) $(CFLAGS) -o $@ $(LDFLAGS) --soname,$@ \
libdvdcss/src/*.o \
`cat $(WRAPPER:.o=.def)` $(WRAPPER)
$(SYSDIR)/libdvdnav-$(ARCH).so: $(WRAPPER) $(DVDCSS_A) libdvdnav/obj/libdvdnav.a
- $(CC) -o $@ $(LDFLAGS) --soname,$@ $(DVDCSS_O) libdvdnav/obj/*.o \
+ $(CC) $(CFLAGS) -o $@ $(LDFLAGS) --soname,$@ $(DVDCSS_O) libdvdnav/obj/*.o \
`cat $(WRAPPER:.o=.def)` $(WRAPPER)
endif
diff -Naur xbmc-9.11-10.0/xbmc/cores/paplayer/AC3Codec/Makefile.in xbmc-9.11-10.1/xbmc/cores/paplayer/AC3Codec/Makefile.in
--- xbmc-9.11-10.0/xbmc/cores/paplayer/AC3Codec/Makefile.in 2009-09-03 11:42:46.000000000 +0200
+++ xbmc-9.11-10.1/xbmc/cores/paplayer/AC3Codec/Makefile.in 2010-01-26 05:14:09.000000000 +0100
@@ -1,5 +1,5 @@
ARCH=@ARCH@
-CFLAGS=-D_LINUX -fPIC -Iinclude -Ivc++
+CFLAGS=-D_LINUX -fPIC -Iinclude
ifeq ($(findstring osx,$(ARCH)), osx)
export MACOSX_DEPLOYMENT_TARGET=10.4
CFLAGS+=-fno-common -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4
@@ -20,7 +20,7 @@
../../../../tools/Mach5/wrapper.rb $@;mv output.so $@
chmod +x $@
else
- $(CC) -fPIC -shared -o $@ $(OBJS) \
+ $(CC) $(CFLAGS) -shared -o $@ $(OBJS) \
`cat ../../DllLoader/exports/wrapper.def` ../../DllLoader/exports/wrapper.o
endif
diff -Naur xbmc-9.11-10.0/xbmc/cores/paplayer/ADPCMCodec/Makefile.in xbmc-9.11-10.1/xbmc/cores/paplayer/ADPCMCodec/Makefile.in
--- xbmc-9.11-10.0/xbmc/cores/paplayer/ADPCMCodec/Makefile.in 2009-03-22 19:56:49.000000000 +0100
+++ xbmc-9.11-10.1/xbmc/cores/paplayer/ADPCMCodec/Makefile.in 2010-01-26 05:14:09.000000000 +0100
@@ -1,7 +1,7 @@
ARCH=@ARCH@
OBJS=uXboxAdpcmDecoder.o ADPCMDll.o
-CFLAGS +=-D_LINUX -fPIC -O2
-CXXFLAGS += -D_LINUX -fPIC -O2
+CFLAGS +=-D_LINUX -fPIC
+CXXFLAGS += -D_LINUX -fPIC
SLIB=../../../../system/players/paplayer/adpcm-@ARCH@.so
@@ -11,7 +11,7 @@
../../../../tools/Mach5/wrapper.rb $@;mv output.so $@
chmod +x $@
else
- $(CC) -shared -o $@ *.o `cat ../../DllLoader/exports/wrapper.def` ../../DllLoader/exports/wrapper.o
+ $(CC) $(CFLAGS) -shared -o $@ *.o `cat ../../DllLoader/exports/wrapper.def` ../../DllLoader/exports/wrapper.o
endif
include ../../../../Makefile.include
diff -Naur xbmc-9.11-10.0/xbmc/cores/paplayer/FLACCodec/Makefile.in xbmc-9.11-10.1/xbmc/cores/paplayer/FLACCodec/Makefile.in
--- xbmc-9.11-10.0/xbmc/cores/paplayer/FLACCodec/Makefile.in 2009-10-07 10:28:05.000000000 +0200
+++ xbmc-9.11-10.1/xbmc/cores/paplayer/FLACCodec/Makefile.in 2010-01-26 05:14:09.000000000 +0100
@@ -19,12 +19,12 @@
else
ifneq (@USE_EXTERNAL_LIBFLAC@,1)
$(FLAC_LIB): flac-1.2.1/src/libFLAC/.libs/libFLAC.a
- $(CC) -shared -fpic -o $@ -rdynamic \
+ $(CC) $(CFLAGS) -shared -fpic -o $@ -rdynamic \
-Wl,--whole-archive flac-1.2.1/src/libFLAC/.libs/libFLAC.a -Wl,--no-whole-archive \
`cat ../../DllLoader/exports/wrapper.def` ../../DllLoader/exports/wrapper.o
else
$(FLAC_LIB):
- $(CC) -shared -fpic -o $@ -rdynamic -lFLAC \
+ $(CC) $(CFLAGS) -shared -fpic -o $@ -rdynamic -lFLAC \
`cat ../../DllLoader/exports/wrapper.def` ../../DllLoader/exports/wrapper.o
endif
endif
diff -Naur xbmc-9.11-10.0/xbmc/cores/paplayer/GYMCodec/Makefile.in xbmc-9.11-10.1/xbmc/cores/paplayer/GYMCodec/Makefile.in
--- xbmc-9.11-10.0/xbmc/cores/paplayer/GYMCodec/Makefile.in 2009-09-03 11:42:46.000000000 +0200
+++ xbmc-9.11-10.1/xbmc/cores/paplayer/GYMCodec/Makefile.in 2010-01-26 05:14:09.000000000 +0100
@@ -15,7 +15,7 @@
../../../../tools/Mach5/wrapper.rb $@;mv output.so $@
chmod +x $@
else
- $(CXX) -shared -o $@ *.o `cat ../../DllLoader/exports/wrapper.def` ../../DllLoader/exports/wrapper.o
+ $(CXX) $(CXXFLAGS) -shared -o $@ *.o `cat ../../DllLoader/exports/wrapper.def` ../../DllLoader/exports/wrapper.o
endif
diff -Naur xbmc-9.11-10.0/xbmc/cores/paplayer/MACDll/Makefile.in xbmc-9.11-10.1/xbmc/cores/paplayer/MACDll/Makefile.in
--- xbmc-9.11-10.0/xbmc/cores/paplayer/MACDll/Makefile.in 2009-10-07 10:28:05.000000000 +0200
+++ xbmc-9.11-10.1/xbmc/cores/paplayer/MACDll/Makefile.in 2010-01-26 05:14:09.000000000 +0100
@@ -65,7 +65,7 @@
../../../../tools/Mach5/wrapper.rb $@;mv output.so $@
chmod +x $@
else
- $(CC) -fPIC -shared -o $@ $(OBJS) \
+ $(CC) $(CFLAGS) -shared -o $@ $(OBJS) \
`cat ../../DllLoader/exports/wrapper.def` ../../DllLoader/exports/wrapper.o
endif
diff -Naur xbmc-9.11-10.0/xbmc/cores/paplayer/ModuleCodec/Makefile.in xbmc-9.11-10.1/xbmc/cores/paplayer/ModuleCodec/Makefile.in
--- xbmc-9.11-10.0/xbmc/cores/paplayer/ModuleCodec/Makefile.in 2009-11-08 02:23:56.000000000 +0100
+++ xbmc-9.11-10.1/xbmc/cores/paplayer/ModuleCodec/Makefile.in 2010-01-26 05:14:09.000000000 +0100
@@ -17,7 +17,7 @@
chmod +x $@
else
- $(CXX) -fPIC -shared -o $@ $(OBJS) -Wl,--whole-archive dumb/lib/unix/libdumb.a \
+ $(CXX) $(CXXFLAGS) -shared -o $@ $(OBJS) -Wl,--whole-archive dumb/lib/unix/libdumb.a \
-Wl,--no-whole-archive `cat ../../DllLoader/exports/wrapper.def` \
../../DllLoader/exports/wrapper.o
diff -Naur xbmc-9.11-10.0/xbmc/cores/paplayer/NSFCodec/Makefile.in xbmc-9.11-10.1/xbmc/cores/paplayer/NSFCodec/Makefile.in
--- xbmc-9.11-10.0/xbmc/cores/paplayer/NSFCodec/Makefile.in 2009-09-03 11:42:46.000000000 +0200
+++ xbmc-9.11-10.1/xbmc/cores/paplayer/NSFCodec/Makefile.in 2010-01-26 05:14:09.000000000 +0100
@@ -20,7 +20,7 @@
../../../../tools/Mach5/wrapper.rb $@;mv output.so $@
chmod +x $@
else
- $(CC) -fPIC -shared -o $@ $(OBJS) `cat ../../DllLoader/exports/wrapper.def` ../../DllLoader/exports/wrapper.o
+ $(CC) $(CFLAGS) -shared -o $@ $(OBJS) `cat ../../DllLoader/exports/wrapper.def` ../../DllLoader/exports/wrapper.o
endif
include ../../../../Makefile.include
diff -Naur xbmc-9.11-10.0/xbmc/cores/paplayer/SIDCodec/Makefile.in xbmc-9.11-10.1/xbmc/cores/paplayer/SIDCodec/Makefile.in
--- xbmc-9.11-10.0/xbmc/cores/paplayer/SIDCodec/Makefile.in 2009-09-03 11:42:46.000000000 +0200
+++ xbmc-9.11-10.1/xbmc/cores/paplayer/SIDCodec/Makefile.in 2010-01-26 05:14:09.000000000 +0100
@@ -17,7 +17,7 @@
../../../../tools/Mach5/wrapper.rb $@;mv output.so $@
chmod +x $@
else
- $(CC) -fPIC -shared -o $@ $(OBJS) ../../../linux/XHandle.o `cat ../../DllLoader/exports/wrapper.def` ../../DllLoader/exports/wrapper.o
+ $(CC) $(CFLAGS) -shared -o $@ $(OBJS) ../../../linux/XHandle.o `cat ../../DllLoader/exports/wrapper.def` ../../DllLoader/exports/wrapper.o
endif
include ../../../../Makefile.include
diff -Naur xbmc-9.11-10.0/xbmc/cores/paplayer/SPCCodec/SNES/SNESAPU/Makefile.in xbmc-9.11-10.1/xbmc/cores/paplayer/SPCCodec/SNES/SNESAPU/Makefile.in
--- xbmc-9.11-10.0/xbmc/cores/paplayer/SPCCodec/SNES/SNESAPU/Makefile.in 2009-03-22 19:56:49.000000000 +0100
+++ xbmc-9.11-10.1/xbmc/cores/paplayer/SPCCodec/SNES/SNESAPU/Makefile.in 2010-01-26 05:14:09.000000000 +0100
@@ -1,8 +1,8 @@
ARCH=@ARCH@
AS=nasm
OBJS=SPC700.o APU.o DSP.o SNESAPU.o
-CFLAGS +=-D_LINUX -fPIC -I../../ -O2
-CXXFLAGS +=-D_LINUX -fPIC -I../../ -O2
+CFLAGS +=-D_LINUX -fPIC -I../..
+CXXFLAGS +=-D_LINUX -fPIC -I../..
ifeq ($(findstring osx,$(ARCH)), osx)
CFLAGS+=-fno-common
CXXFLAGS+=-fno-common
@@ -25,7 +25,7 @@
../../../../../../tools/Mach5/wrapper.rb $@;mv output.so $@
chmod +x $@
else
- $(CC) -shared -o $@ $(OBJS) \
+ $(CC) $(CFLAGS) -shared -o $@ $(OBJS) \
`cat ../../../../DllLoader/exports/wrapper.def` ../../../../DllLoader/exports/wrapper.o
endif
diff -Naur xbmc-9.11-10.0/xbmc/cores/paplayer/timidity/Makefile.in xbmc-9.11-10.1/xbmc/cores/paplayer/timidity/Makefile.in
--- xbmc-9.11-10.0/xbmc/cores/paplayer/timidity/Makefile.in 2009-09-03 11:42:46.000000000 +0200
+++ xbmc-9.11-10.1/xbmc/cores/paplayer/timidity/Makefile.in 2010-01-26 05:14:09.000000000 +0100
@@ -1,6 +1,6 @@
ARCH=@ARCH@
-CFLAGS+=-D_LINUX -fPIC -O2 -DHAVE_GETTIMEOFDAY -I. -Itimidity -Ilibarc -Iutils
+CFLAGS+=-D_LINUX -fPIC -DHAVE_GETTIMEOFDAY -I. -Itimidity -Ilibarc -Iutils
ifeq ($(ARCH), powerpc-osx)
BUNDLE1_O=-lbundle1.o -L/usr/lib/gcc/powerpc-apple-darwin8/4.0.1/ -lgcc
endif
@@ -57,7 +57,7 @@
../../../../tools/Mach5/wrapper.rb $@;mv output.so $@
chmod +x $@
else
- $(CXX) -shared -o $@ $(OBJS) `cat ../../DllLoader/exports/wrapper.def` ../../DllLoader/exports/wrapper.o -Wl,--version-script=exports.def
+ $(CXX) $(CXXFLAGS) -shared -o $@ $(OBJS) `cat ../../DllLoader/exports/wrapper.def` ../../DllLoader/exports/wrapper.o -Wl,--version-script=exports.def
endif
include ../../../../Makefile.include
diff -Naur xbmc-9.11-10.0/xbmc/cores/paplayer/vgmstream/Makefile.in xbmc-9.11-10.1/xbmc/cores/paplayer/vgmstream/Makefile.in
--- xbmc-9.11-10.0/xbmc/cores/paplayer/vgmstream/Makefile.in 2009-03-23 00:27:25.000000000 +0100
+++ xbmc-9.11-10.1/xbmc/cores/paplayer/vgmstream/Makefile.in 2010-01-26 05:14:09.000000000 +0100
@@ -4,8 +4,8 @@
CFLAGS +=-D_LINUX -fPIC -DPIC -O3 -DXBMC
CXXFLAGS +=-D_LINUX -fPIC -DPIC -O3 -DXBMC
else
- CFLAGS +=-D_LINUX -fPIC -DPIC -O3 -fno-stack-protector -DXBMC
- CXXFLAGS +=-D_LINUX -fPIC -DPIC -O3 -fno-stack-protector -DXBMC
+ CFLAGS +=-D_LINUX -fPIC -DXBMC
+ CXXFLAGS +=-D_LINUX -fPIC -DXBMC
endif
CODING_OBJS=src/coding/acm_decoder.o \
diff -Naur xbmc-9.11-10.0/xbmc/cores/paplayer/vorbisfile/Makefile.in xbmc-9.11-10.1/xbmc/cores/paplayer/vorbisfile/Makefile.in
--- xbmc-9.11-10.0/xbmc/cores/paplayer/vorbisfile/Makefile.in 2009-09-03 11:42:46.000000000 +0200
+++ xbmc-9.11-10.1/xbmc/cores/paplayer/vorbisfile/Makefile.in 2010-01-26 05:14:09.000000000 +0100
@@ -33,7 +33,7 @@
../../../../tools/Mach5/wrapper.rb $@;mv output.so $@
chmod +x $@
else
- $(CC) -shared -o $@ $(VORBIS_LINK_OPTS) $(OGG_LINK_OPTS) \
+ $(CC) $(CFLAGS) -shared -o $@ $(VORBIS_LINK_OPTS) $(OGG_LINK_OPTS) \
`cat ../../DllLoader/exports/wrapper.def` \
../../DllLoader/exports/wrapper.o
endif
diff -Naur xbmc-9.11-10.0/xbmc/cores/paplayer/WavPackCodec/Makefile.in xbmc-9.11-10.1/xbmc/cores/paplayer/WavPackCodec/Makefile.in
--- xbmc-9.11-10.0/xbmc/cores/paplayer/WavPackCodec/Makefile.in 2009-09-03 11:42:46.000000000 +0200
+++ xbmc-9.11-10.1/xbmc/cores/paplayer/WavPackCodec/Makefile.in 2010-01-26 05:14:09.000000000 +0100
@@ -14,7 +14,7 @@
../../../../tools/Mach5/wrapper.rb $@;mv output.so $@
chmod +x $@
else
- $(CC) -fPIC -shared -o $@ $(OBJS) `cat ../../DllLoader/exports/wrapper.def` ../../DllLoader/exports/wrapper.o
+ $(CC) $(CFLAGS) -shared -o $@ $(OBJS) `cat ../../DllLoader/exports/wrapper.def` ../../DllLoader/exports/wrapper.o
endif
include ../../../../Makefile.include
diff -Naur xbmc-9.11-10.0/xbmc/cores/paplayer/YMCodec/StSoundLibrary/Makefile.in xbmc-9.11-10.1/xbmc/cores/paplayer/YMCodec/StSoundLibrary/Makefile.in
--- xbmc-9.11-10.0/xbmc/cores/paplayer/YMCodec/StSoundLibrary/Makefile.in 2009-09-03 11:42:46.000000000 +0200
+++ xbmc-9.11-10.1/xbmc/cores/paplayer/YMCodec/StSoundLibrary/Makefile.in 2010-01-26 05:14:09.000000000 +0100
@@ -17,7 +17,7 @@
../../../../../tools/Mach5/wrapper.rb $@;mv output.so $@
chmod +x $@
else
- $(CC) -fPIC -shared -o $@ $(OBJS) `cat ../../../DllLoader/exports/wrapper.def` ../../../DllLoader/exports/wrapper.o
+ $(CC) $(CFLAGS) -shared -o $@ $(OBJS) `cat ../../../DllLoader/exports/wrapper.def` ../../../DllLoader/exports/wrapper.o
endif
include ../../../../../Makefile.include
diff -Naur xbmc-9.11-10.0/xbmc/lib/libid3tag/Makefile.in xbmc-9.11-10.1/xbmc/lib/libid3tag/Makefile.in
--- xbmc-9.11-10.0/xbmc/lib/libid3tag/Makefile.in 2009-10-07 10:28:05.000000000 +0200
+++ xbmc-9.11-10.1/xbmc/lib/libid3tag/Makefile.in 2010-01-26 05:14:09.000000000 +0100
@@ -16,7 +16,7 @@
chmod +x $@
else
$(SLIB): libid3tag/.libs/libid3tag.so
- $(CXX) -shared -fPIC -O3 -o $@ libid3tag/.libs/*.o \
+ $(CXX) $(CXXFLAGS) -shared -fPIC -o $@ libid3tag/.libs/*.o \
`cat ../../cores/DllLoader/exports/wrapper.def` \
../../cores/DllLoader/exports/wrapper.o
endif
diff -Naur xbmc-9.11-10.0/xbmc/visualizations/Goom/Makefile.in xbmc-9.11-10.1/xbmc/visualizations/Goom/Makefile.in
--- xbmc-9.11-10.0/xbmc/visualizations/Goom/Makefile.in 2009-03-23 01:04:05.000000000 +0100
+++ xbmc-9.11-10.1/xbmc/visualizations/Goom/Makefile.in 2010-01-26 05:14:09.000000000 +0100
@@ -2,7 +2,7 @@
INCLUDES=-I. -I.. -I../../linux -I../../ -I../../../guilib -I../../../visualisations -Igoom2k4-0/src
OBJS=Main.o
SLIB=../../../visualisations/Goom.vis
-CXXFLAGS=-g -O3 -fPIC
+CXXFLAGS=-fPIC
DIRS=goom2k4-0
$(SLIB): $(OBJS) goom2k4-0/src/.libs/libgoom2.a
diff -Naur xbmc-9.11-10.0/xbmc/visualizations/XBMCProjectM/Makefile.in xbmc-9.11-10.1/xbmc/visualizations/XBMCProjectM/Makefile.in
--- xbmc-9.11-10.0/xbmc/visualizations/XBMCProjectM/Makefile.in 2009-07-09 02:00:27.000000000 +0200
+++ xbmc-9.11-10.1/xbmc/visualizations/XBMCProjectM/Makefile.in 2010-01-26 05:14:09.000000000 +0100
@@ -2,7 +2,7 @@
INCLUDES=-I. -I.. -I../../linux -I../../ -I../../../guilib -I../../../visualisations
OBJS=Main.o
SLIB=../../../visualisations/ProjectM.vis
-CXXFLAGS=-O3 -g -fPIC
+CXXFLAGS=-fPIC
DIRS=libprojectM
ifeq ($(findstring osx,$(ARCH)), osx)
@@ -18,7 +18,7 @@
$(MAKE) -C libprojectM
else
$(SLIB): $(OBJS) libprojectM/libprojectM.so
- $(CXX) ./libprojectM/CMakeFiles/projectM.dir/*.o -fPIC -shared $(CFLAGS) -o $(SLIB) $(OBJS) `cat ../../cores/DllLoader/exports/wrapper.def` ../../cores/DllLoader/exports/wrapper.o
+ $(CXX) $(CXXFLAGS) ./libprojectM/CMakeFiles/projectM.dir/*.o -fPIC -shared -o $(SLIB) $(OBJS) `cat ../../cores/DllLoader/exports/wrapper.def` ../../cores/DllLoader/exports/wrapper.o
libprojectM/libprojectM.so:
$(MAKE) -C libprojectM
xbmc-9.11-changeset-26191.diff:
lib/cximage-6.0/CxImage/DllInterface.cpp | 1 -
lib/libUPnP/Neptune/Source/Core/NptUtils.h | 2 +-
lib/libUPnP/Neptune/Source/System/StdC/NptStdCTime.cpp | 4 ++--
linux/NetworkLinux.cpp | 1 +
4 files changed, 4 insertions(+), 4 deletions(-)
--- NEW FILE xbmc-9.11-changeset-26191.diff ---
diff -Naur xbmc-9.11.orig/xbmc/lib/cximage-6.0/CxImage/DllInterface.cpp xbmc-9.11/xbmc/lib/cximage-6.0/CxImage/DllInterface.cpp
--- xbmc-9.11.orig/xbmc/lib/cximage-6.0/CxImage/DllInterface.cpp 2009-10-24 06:12:27.000000000 +0200
+++ xbmc-9.11/xbmc/lib/cximage-6.0/CxImage/DllInterface.cpp 2010-01-02 10:49:17.000000000 +0100
@@ -188,7 +188,6 @@
int ResampleKeepAspectArea(CxImage &image, unsigned int area)
{
- bool bResize = false;
float fAspect = ((float)image.GetWidth()) / ((float)image.GetHeight());
unsigned int width = (unsigned int)sqrt(area * fAspect);
unsigned int height = (unsigned int)sqrt(area / fAspect);
diff -Naur xbmc-9.11.orig/xbmc/linux/NetworkLinux.cpp xbmc-9.11/xbmc/linux/NetworkLinux.cpp
--- xbmc-9.11.orig/xbmc/linux/NetworkLinux.cpp 2009-11-20 05:52:25.000000000 +0100
+++ xbmc-9.11/xbmc/linux/NetworkLinux.cpp 2010-01-03 05:25:29.000000000 +0100
@@ -636,6 +636,7 @@
if (!fw)
{
// TODO
+ fclose(fr);
return;
}
diff -Naur xbmc-9.11.orig/xbmc/lib/libUPnP/Neptune/Source/Core/NptUtils.h xbmc-9.11/xbmc/lib/libUPnP/Neptune/Source/Core/NptUtils.h
--- xbmc-9.11.orig/xbmc/lib/libUPnP/Neptune/Source/Core/NptUtils.h 2009-07-06 10:12:52.000000000 +0200
+++ xbmc-9.11/xbmc/lib/libUPnP/Neptune/Source/Core/NptUtils.h 2010-01-02 08:26:18.000000000 +0100
@@ -205,7 +205,7 @@
#endif
#if defined(NPT_CONFIG_HAVE_MEMSET)
-#define NPT_SetMemory memset
+#define NPT_SetMemory(dest, c, s) memset(dest, c, s)
#else
extern void NPT_SetMemory(void* dest, int c, NPT_Size size);
#endif
diff -Naur xbmc-9.11.orig/xbmc/lib/libUPnP/Neptune/Source/System/StdC/NptStdCTime.cpp xbmc-9.11/xbmc/lib/libUPnP/Neptune/Source/System/StdC/NptStdCTime.cpp
--- xbmc-9.11.orig/xbmc/lib/libUPnP/Neptune/Source/System/StdC/NptStdCTime.cpp 2009-10-10 12:22:06.000000000 +0200
+++ xbmc-9.11/xbmc/lib/libUPnP/Neptune/Source/System/StdC/NptStdCTime.cpp 2010-01-02 08:26:48.000000000 +0100
@@ -90,7 +90,7 @@
time_t ltime;
struct tm gmt;
- NPT_SetMemory(&gmt, sizeof(gmt), 0);
+ NPT_SetMemory(&gmt, 0, sizeof(gmt));
ltime = (time_t) time.m_Seconds;
int result = gmtime_s(&gmt, <ime);
@@ -112,7 +112,7 @@
time_t ltime;
struct tm local;
- NPT_SetMemory(&local, sizeof(local), 0);
+ NPT_SetMemory(&local, 0, sizeof(local));
/* get the current time stamp */
NPT_CHECK_SEVERE(NPT_System::GetCurrentTimeStamp(now));
xbmc-9.11-configure.patch:
configure.in | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
--- NEW FILE xbmc-9.11-configure.patch ---
diff -Naur xbmc-9.11-11.0/configure.in xbmc-9.11-11.1/configure.in
--- xbmc-9.11-11.0/configure.in 2010-02-03 07:34:17.000000000 +0100
+++ xbmc-9.11-11.1/configure.in 2010-02-03 07:33:21.000000000 +0100
@@ -1217,9 +1217,12 @@
--cc="$CC"
else
./configure2 \
- --extra-cflags="-D_XBMC -fPIC -DPIC" \
+ --prefix="${prefix}" --includedir="${includedir}" --libdir="${libdir}" --datadir="${datadir}" \
+ --extra-cflags="$CFLAGS -D_XBMC -fPIC -DPIC" \
--enable-static \
--disable-shared \
+ --disable-strip \
+ --disable-opts \
--cc="$CC"
fi
], [0])
@@ -1317,10 +1320,12 @@
--disable-debugging \
--with-pic
else
- CFLAGS=-O3 \
./configure \
+ CPPFLAGS="$CPPFLAGS" \
+ CFLAGS="$CFLAGS -fPIC" \
+ CXXFLAGS="$CXXFLAGS -fPIC" \
+ --prefix="${prefix}" --includedir="${includedir}" --libdir="${libdir}" --datadir="${datadir}" \
--disable-static \
- --disable-debugging \
--with-pic
fi
], [0])
@@ -1333,7 +1338,7 @@
rm -f CMakeCache.txt && cmake -DCMAKE_BUILD_TYPE=None -DUSE_FTGL:BOOL=OFF \
-DCMAKE_C_FLAGS="${CFLAGS}" -DCMAKE_CXX_FLAGS="${CXXFLAGS}" \
-DCMAKE_INSTALL_PREFIX="${prefix}" -DCMAKE_INSTALL_LIBDIR:PATH="${libdir}" \
- -DINCLUDE_INSTALL_DIR:PATH="${includedir}" -DLIB_INSTALL_DIR:PATH="${_libdir}" \
+ -DINCLUDE_INSTALL_DIR:PATH="${includedir}" -DLIB_INSTALL_DIR:PATH="${libdir}" \
-DSYSCONF_INSTALL_DIR:PATH="${sysconfdir}" -DSHARE_INSTALL_PREFIX:PATH="${datadir}" .
set +x
fi
@@ -1342,10 +1347,13 @@
XB_CONFIG_MODULE([xbmc/visualizations/Goom/goom2k4-0],[
if test "$host_vendor" != "apple" ; then
./configure \
+ CPPFLAGS="$CPPFLAGS" \
+ CFLAGS="$CFLAGS -fPIC" \
+ CXXFLAGS="$CXXFLAGS -fPIC" \
+ --prefix="${prefix}" --includedir="${includedir}" --libdir="${libdir}" --datadir="${datadir}" \
--disable-shared \
--enable-static \
--with-pic
-
fi
], [$BUILD_GOOM])
xbmc-9.11-external-zlib.diff:
configure.in | 22 +++++++++++++++++++++-
xbmc/FileSystem/FileZip.h | 2 +-
xbmc/FileSystem/ZipDirectory.cpp | 2 +-
3 files changed, 23 insertions(+), 3 deletions(-)
--- NEW FILE xbmc-9.11-external-zlib.diff ---
diff -Naur xbmc-9.11-8/configure.in xbmc-9.11/configure.in
--- xbmc-9.11-8/configure.in 2010-01-21 14:04:04.000000000 +0100
+++ xbmc-9.11/configure.in 2010-01-21 18:58:26.000000000 +0100
@@ -59,6 +59,8 @@
external_libogg_disabled="== Use of external libogg disabled. =="
external_libwavpack_enabled="== Use of external libwavpack enabled. =="
external_libwavpack_disabled="== Use of external libwavpack disabled. =="
+external_libz_enabled="== Use of external libz enabled. =="
+external_libz_disabled="== Use of external libz disabled. =="
external_python_enabled="== Use of external python enabled. =="
external_python_disabled="== Use of external python disabled. =="
ffmpeg_vdpau_not_supported="== External ffmpeg doesn't support VDPAU. VDPAU support disabled. =="
@@ -223,6 +225,12 @@
[use_external_libwavpack=$enableval],
[use_external_libwavpack=no])
+AC_ARG_ENABLE([external-libz],
+ [AS_HELP_STRING([--enable-external-libz],
+ [enable use of external libz library (default is no)])],
+ [use_external_libz=$enableval],
+ [use_external_libz=no])
+
AC_ARG_ENABLE([external-python],
[AS_HELP_STRING([--enable-external-python],
[enable use of external python library (default is no) 'Linux only'])],
@@ -611,6 +619,18 @@
USE_EXTERNAL_LIBWAVPACK=0
fi
+# External libz
+if test "$use_external_libraries" = "yes" || test "$use_external_libz" = "yes"; then
+ AC_CHECK_LIB([z], [main],, AC_MSG_ERROR($missing_library))
+ AC_CHECK_HEADERS([zlib.h],, AC_MSG_ERROR([$missing_headers]))
+ AC_MSG_NOTICE($external_libz_enabled)
+ USE_EXTERNAL_LIBZ=1
+ AC_DEFINE([USE_EXTERNAL_LIBZ], [1], [Whether to use external libz library/zlib.])
+else
+ AC_MSG_NOTICE($external_libz_disabled)
+ USE_EXTERNAL_LIBZ=0
+fi
+
# External Python
if test "$use_external_libraries" = "yes" || test "$use_external_python" = "yes"; then
AC_CHECK_LIB([python2.6], [main],,
@@ -1276,7 +1296,7 @@
CFLAGS="-fPIC -fno-common -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" \
./configure
fi
-], [0])
+], [$USE_EXTERNAL_LIBZ])
XB_CONFIG_MODULE([xbmc/lib/libass], [
if test "$host_vendor" = "apple" ; then
diff -Naur xbmc-9.11-8/xbmc/FileSystem/FileZip.h xbmc-9.11/xbmc/FileSystem/FileZip.h
--- xbmc-9.11-8/xbmc/FileSystem/FileZip.h 2009-09-23 05:50:54.000000000 +0200
+++ xbmc-9.11/xbmc/FileSystem/FileZip.h 2010-01-21 16:48:18.000000000 +0100
@@ -23,7 +23,7 @@
#include "IFile.h"
-#include "lib/zlib/zlib.h"
+#include <zlib.h>
#include "utils/log.h"
#include "GUIWindowManager.h"
#include "FileSystem/File.h"
diff -Naur xbmc-9.11-8/xbmc/FileSystem/ZipDirectory.cpp xbmc-9.11/xbmc/FileSystem/ZipDirectory.cpp
--- xbmc-9.11-8/xbmc/FileSystem/ZipDirectory.cpp 2009-10-14 00:53:03.000000000 +0200
+++ xbmc-9.11/xbmc/FileSystem/ZipDirectory.cpp 2010-01-21 16:48:18.000000000 +0100
@@ -23,7 +23,7 @@
#include "utils/log.h"
#include "utils/CharsetConverter.h"
#include "Util.h"
-#include "lib/zlib/zlib.h"
+#include <zlib.h>
#include "URL.h"
#include "ZipManager.h"
#include "FileItem.h"
xbmc-9.11-fix-Makefile.in.patch:
Makefile.in | 58 +++++++++++++++++++++++++++-------------------------------
1 file changed, 27 insertions(+), 31 deletions(-)
--- NEW FILE xbmc-9.11-fix-Makefile.in.patch ---
--- Makefile.in.orig 2009-12-31 18:35:33.201505454 -0500
+++ Makefile.in 2009-12-31 18:36:29.747380027 -0500
@@ -416,7 +416,7 @@
$(MAKE) -C tools/TexturePacker/
install-bin: xbmc.bin # developement convenience target
- sudo install -D xbmc.bin $(prefix)/share/xbmc
+ sudo install -D xbmc.bin $(DESTDIR)$(libdir)/xbmc
ifeq ($(findstring osx,$(ARCH)), osx)
# TODO: add osx install
@@ -424,55 +424,51 @@
install: install-binaries install-arch install-datas install-web
install-binaries: install-scripts
- @echo "Copying XBMC binary to $(prefix)/share/xbmc/xbmc.bin"
- @install -D xbmc.bin $(prefix)/share/xbmc/xbmc.bin
- @install -D xbmc-xrandr $(prefix)/share/xbmc/xbmc-xrandr
+ @echo "Copying XBMC binary to $(DESTDIR)$(libdir)/xbmc/xbmc.bin"
+ @install -D xbmc.bin $(DESTDIR)$(libdir)/xbmc/xbmc.bin
+ @install -D xbmc-xrandr $(DESTDIR)$(libdir)/xbmc/xbmc-xrandr
@echo "You can run XBMC with the command 'xbmc'"
endif
install-arch:
- @# Arch dependent files
- @find system screensavers visualisations -regextype posix-extended -type f -not -iregex ".*svn.*|.*win32(dx)?\.vis|.*osx\.vis" -iregex ".*$(ARCH).*|.*\.vis|.*\.xbs" -exec install -D "{}" $(prefix)/share/xbmc/"{}" \; -printf " -- %-75.75f\r"
+ @find system screensavers visualisations -regextype posix-extended -type f -not -iregex ".*svn.*|.*win32(dx)?\.vis|.*osx\.vis" -iregex ".*$(ARCH).*|.*\.vis|.*\.xbs" -exec install -D "{}" $(DESTDIR)$(libdir)/xbmc/"{}" \; -printf " -- %-75.75f\r"
install-scripts:
- @install -D tools/Linux/xbmc.sh $(prefix)/bin/xbmc
- @install -D tools/Linux/xbmc-standalone.sh $(prefix)/bin/xbmc-standalone
- @install -D -m 0644 tools/Linux/FEH.py $(prefix)/share/xbmc/FEH.py
- @install -D -m 0644 tools/Linux/xbmc-xsession.desktop $(prefix)/share/xsessions/XBMC.desktop
+ @install -D tools/Linux/xbmc.sh $(DESTDIR)$(bindir)/xbmc
+ @install -D tools/Linux/xbmc-standalone.sh $(DESTDIR)$(bindir)/xbmc-standalone
+ @install -D -m 0644 tools/Linux/FEH.py $(DESTDIR)$(libdir)/xbmc/FEH.py
+ @install -D -m 0644 tools/Linux/xbmc-xsession.desktop $(DESTDIR)$(prefix)/share/xsessions/XBMC.desktop
install-datas: install-scripts
@echo "Copying support and legal files..."
@for FILE in `ls README.linux LICENSE.GPL *.txt`; do \
- install -D -m 0644 "$$FILE" $(prefix)/share/xbmc/; done
+ install -D -m 0644 "$$FILE" $(DESTDIR)$(libdir)/xbmc/; done
@echo "Done!"
- @echo "Copying system files to $(prefix)/share/xbmc"
- @# Arch independent files
- @find language media scripts sounds userdata visualisations system -regextype posix-extended -type f -not -iregex ".*svn.*|.*\.so|.*\.dll|.*\.pyd|.*python/.*\.zlib|.*\.vis" -exec install -D -m 0644 "{}" $(prefix)/share/xbmc/"{}" \; -printf " -- %-75.75f\r"
- @# Skins
- @find skin -regextype posix-extended -type f -not -iregex '.*/\.svn/.*|^skin/[^/]*/media/.*[^x][^b][^t]' -exec install -D -m 0644 '{}' $(prefix)/share/xbmc/'{}' \; -printf " -- %-75.75f\r"
- @# Icons and links
- @mkdir -p $(prefix)/share/applications $(prefix)/share/pixmaps
- @cp -a tools/Linux/xbmc.png $(prefix)/share/pixmaps/
- @cp -a tools/Linux/xbmc.desktop $(prefix)/share/applications/
+ @echo "Copying system files to $(DESTDIR)$(libdir)/xbmc"
+ @find language media scripts sounds userdata visualisations system -regextype posix-extended -type f -not -iregex ".*svn.*|.*\.so|.*\.dll|.*\.pyd|.*python/.*\.zlib|.*\.vis" -exec install -D -m 0644 "{}" $(DESTDIR)$(libdir)/xbmc/"{}" \; -printf " -- %-75.75f\r"
+ @find skin -regextype posix-extended -type f -not -iregex '.*/\.svn/.*|^skin/[^/]*/media/.*[^x][^b][^t]' -exec install -D -m 0644 '{}' $(DESTDIR)$(libdir)/xbmc/'{}' \; -printf " -- %-75.75f\r"
+ @mkdir -p $(DESTDIR)$(prefix)/share/applications $(DESTDIR)$(prefix)/share/pixmaps
+ @cp -a tools/Linux/xbmc.png $(DESTDIR)$(prefix)/share/pixmaps/
+ @cp -a tools/Linux/xbmc.desktop $(DESTDIR)$(prefix)/share/applications/
install-livedatas:
@echo "Install Live CD datas in $(prefix) ..."
- @mkdir -p $(prefix)/bin
- @install -D tools/XBMCLive/diskmounter $(prefix)/bin
- @install -D tools/XBMCLive/installXBMC $(prefix)/bin
- @install -D tools/XBMCLive/runXBMC $(prefix)/bin
- @install -D tools/XBMCLive/setAlsaVolumes $(prefix)/bin
+ @mkdir -p $(DESTDIR)$(bindir)
+ @install -D tools/XBMCLive/diskmounter $(DESTDIR)$(bindir)
+ @install -D tools/XBMCLive/installXBMC $(DESTDIR)$(bindir)
+ @install -D tools/XBMCLive/runXBMC $(DESTDIR)$(bindir)
+ @install -D tools/XBMCLive/setAlsaVolumes $(DESTDIR)$(bindir)
install-web:
- @mkdir -p $(prefix)/share/xbmc/web
- @cp -r web/Project_Mayhem_III/* $(prefix)/share/xbmc/web
- @find $(prefix)/share/xbmc/web -depth -name .svn -exec rm -rf {} \;
+ @mkdir -p $(DESTDIR)$(libdir)/xbmc/web
+ @cp -r web/Project_Mayhem_III/* $(DESTDIR)$(libdir)/xbmc/web
+ @find $(DESTDIR)$(libdir)/xbmc/web -depth -name .svn -exec rm -rf {} \;
uninstall:
@echo "Removing XBMC..."
- @rm -rf $(prefix)/share/xbmc $(prefix)/bin/xbmc
- @rm -rf $(prefix)/bin/xbmc-standalone
- @rm -rf $(prefix)/share/xsessions/XBMC.desktop
+ @rm -rf $(DESTDIR)$(libdir)/xbmc $(DESTDIR)$(bindir)/xbmc
+ @rm -rf $(DESTDIR)$(bindir)/xbmc-standalone
+ @rm -rf $(DESTDIR)$(prefix)/share/xsessions/XBMC.desktop
@echo "Done!"
reallyclean:
xbmc-9.11-goom-missing.diff:
missing | 274 +++++++++++++++++++++++++++++++++++++++++++++++++++++-----------
1 file changed, 230 insertions(+), 44 deletions(-)
--- NEW FILE xbmc-9.11-goom-missing.diff ---
diff -Naur xbmc-9.11.orig/xbmc/visualizations/Goom/goom2k4-0/missing xbmc-9.11/xbmc/visualizations/Goom/goom2k4-0/missing
--- xbmc-9.11.orig/xbmc/visualizations/Goom/goom2k4-0/missing 2009-08-31 22:54:54.000000000 +0200
+++ xbmc-9.11/xbmc/visualizations/Goom/goom2k4-0/missing 2010-01-02 06:09:10.000000000 +0100
@@ -1,7 +1,11 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-# Copyright (C) 1996, 1997 Free Software Foundation, Inc.
-# Franc,ois Pinard <pinard(a)iro.umontreal.ca>, 1996.
+
+scriptversion=2009-04-28.21; # UTC
+
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
+# 2008, 2009 Free Software Foundation, Inc.
+# Originally by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -14,16 +18,48 @@
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
if test $# -eq 0; then
echo 1>&2 "Try \`$0 --help' for more information"
exit 1
fi
-case "$1" in
+run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
+
+# In the cases where this matters, `missing' is being run in the
+# srcdir already.
+if test -f configure.ac; then
+ configure_ac=configure.ac
+else
+ configure_ac=configure.in
+fi
+
+msg="missing on your system"
+
+case $1 in
+--run)
+ # Try to run requested program, and just exit if it succeeds.
+ run=
+ shift
+ "$@" && exit 0
+ # Exit code 63 means version mismatch. This often happens
+ # when the user try to use an ancient version of a tool on
+ # a file that requires a minimum version. In this case we
+ # we should proceed has if the program had been absent, or
+ # if --run hadn't been passed.
+ if test $? = 63; then
+ run=:
+ msg="probably too old"
+ fi
+ ;;
-h|--h|--he|--hel|--help)
echo "\
@@ -35,21 +71,32 @@
Options:
-h, --help display this help and exit
-v, --version output version information and exit
+ --run try to run the given command, and emulate it if it fails
Supported PROGRAM values:
aclocal touch file \`aclocal.m4'
autoconf touch file \`configure'
autoheader touch file \`config.h.in'
+ autom4te touch the output file, or create a stub one
automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
+ help2man touch the output file
lex create \`lex.yy.c', if possible, from existing .c
makeinfo touch the output file
- yacc create \`y.tab.[ch]', if possible, from existing .[ch]"
+ tar try tar, gnutar, gtar, then tar without non-portable flags
+ yacc create \`y.tab.[ch]', if possible, from existing .[ch]
+
+Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
+\`g' are ignored when checking the name.
+
+Send bug reports to <bug-automake(a)gnu.org>."
+ exit $?
;;
-v|--v|--ve|--ver|--vers|--versi|--versio|--version)
- echo "missing - GNU libit 0.0"
+ echo "missing $scriptversion (GNU Automake)"
+ exit $?
;;
-*)
@@ -58,35 +105,77 @@
exit 1
;;
- aclocal)
+esac
+
+# normalize program name to check for.
+program=`echo "$1" | sed '
+ s/^gnu-//; t
+ s/^gnu//; t
+ s/^g//; t'`
+
+# Now exit if we have it, but it failed. Also exit now if we
+# don't have it and --version was passed (most likely to detect
+# the program). This is about non-GNU programs, so use $1 not
+# $program.
+case $1 in
+ lex*|yacc*)
+ # Not GNU programs, they don't have --version.
+ ;;
+
+ tar*)
+ if test -n "$run"; then
+ echo 1>&2 "ERROR: \`tar' requires --run"
+ exit 1
+ elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
+ exit 1
+ fi
+ ;;
+
+ *)
+ if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+ # We have it, but it failed.
+ exit 1
+ elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
+ # Could not run --version or --help. This is probably someone
+ # running `$TOOL --version' or `$TOOL --help' to check whether
+ # $TOOL exists and not knowing $TOOL uses missing.
+ exit 1
+ fi
+ ;;
+esac
+
+# If it does not exist, or fails to run (possibly an outdated version),
+# try to emulate it.
+case $program in
+ aclocal*)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
- you modified \`acinclude.m4' or \`configure.in'. You might want
+WARNING: \`$1' is $msg. You should only need it if
+ you modified \`acinclude.m4' or \`${configure_ac}'. You might want
to install the \`Automake' and \`Perl' packages. Grab them from
any GNU archive site."
touch aclocal.m4
;;
- autoconf)
+ autoconf*)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
- you modified \`configure.in'. You might want to install the
+WARNING: \`$1' is $msg. You should only need it if
+ you modified \`${configure_ac}'. You might want to install the
\`Autoconf' and \`GNU m4' packages. Grab them from any GNU
archive site."
touch configure
;;
- autoheader)
+ autoheader*)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
- you modified \`acconfig.h' or \`configure.in'. You might want
+WARNING: \`$1' is $msg. You should only need it if
+ you modified \`acconfig.h' or \`${configure_ac}'. You might want
to install the \`Autoconf' and \`GNU m4' packages. Grab them
from any GNU archive site."
- files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' configure.in`
+ files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
- case "$f" in
+ case $f in
*:*) touch_files="$touch_files "`echo "$f" |
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
*) touch_files="$touch_files $f.in";;
@@ -95,10 +184,10 @@
touch $touch_files
;;
- automake)
+ automake*)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
- you modified \`Makefile.am', \`acinclude.m4' or \`configure.in'.
+WARNING: \`$1' is $msg. You should only need it if
+ you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
You might want to install the \`Automake' and \`Perl' packages.
Grab them from any GNU archive site."
find . -type f -name Makefile.am -print |
@@ -106,81 +195,170 @@
while read f; do touch "$f"; done
;;
- bison|yacc)
+ autom4te*)
+ echo 1>&2 "\
+WARNING: \`$1' is needed, but is $msg.
+ You might have modified some files without having the
+ proper tools for further handling them.
+ You can get \`$1' as part of \`Autoconf' from any GNU
+ archive site."
+
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -f "$file"; then
+ touch $file
+ else
+ test -z "$file" || exec >$file
+ echo "#! /bin/sh"
+ echo "# Created by GNU Automake missing as a replacement of"
+ echo "# $ $@"
+ echo "exit 0"
+ chmod +x $file
+ exit 1
+ fi
+ ;;
+
+ bison*|yacc*)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' $msg. You should only need it if
you modified a \`.y' file. You may need the \`Bison' package
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
rm -f y.tab.c y.tab.h
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.c
fi
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.h
fi
;;
esac
fi
- if [ ! -f y.tab.h ]; then
+ if test ! -f y.tab.h; then
echo >y.tab.h
fi
- if [ ! -f y.tab.c ]; then
+ if test ! -f y.tab.c; then
echo 'main() { return 0; }' >y.tab.c
fi
;;
- lex|flex)
+ lex*|flex*)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified a \`.l' file. You may need the \`Flex' package
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
rm -f lex.yy.c
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" lex.yy.c
fi
;;
esac
fi
- if [ ! -f lex.yy.c ]; then
+ if test ! -f lex.yy.c; then
echo 'main() { return 0; }' >lex.yy.c
fi
;;
- makeinfo)
+ help2man*)
+ echo 1>&2 "\
+WARNING: \`$1' is $msg. You should only need it if
+ you modified a dependency of a manual page. You may need the
+ \`Help2man' package in order for those modifications to take
+ effect. You can get \`Help2man' from any GNU archive site."
+
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -f "$file"; then
+ touch $file
+ else
+ test -z "$file" || exec >$file
+ echo ".ab help2man is required to generate this page"
+ exit $?
+ fi
+ ;;
+
+ makeinfo*)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified a \`.texi' or \`.texinfo' file, or any other file
indirectly affecting the aspect of the manual. The spurious
call might also be the consequence of using a buggy \`make' (AIX,
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ # The file to touch is that specified with -o ...
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -z "$file"; then
- file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
+ # ... or it is the one specified with @setfilename ...
+ infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
+ file=`sed -n '
+ /^@setfilename/{
+ s/.* \([^ ]*\) *$/\1/
+ p
+ q
+ }' $infile`
+ # ... or it is derived from the source name (dir/f.texi becomes f.info)
+ test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
fi
+ # If the file does not exist, the user really needs makeinfo;
+ # let's fail without touching anything.
+ test -f $file || exit 1
touch $file
;;
+ tar*)
+ shift
+
+ # We have already tried tar in the generic part.
+ # Look for gnutar/gtar before invocation to avoid ugly error
+ # messages.
+ if (gnutar --version > /dev/null 2>&1); then
+ gnutar "$@" && exit 0
+ fi
+ if (gtar --version > /dev/null 2>&1); then
+ gtar "$@" && exit 0
+ fi
+ firstarg="$1"
+ if shift; then
+ case $firstarg in
+ *o*)
+ firstarg=`echo "$firstarg" | sed s/o//`
+ tar "$firstarg" "$@" && exit 0
+ ;;
+ esac
+ case $firstarg in
+ *h*)
+ firstarg=`echo "$firstarg" | sed s/h//`
+ tar "$firstarg" "$@" && exit 0
+ ;;
+ esac
+ fi
+
+ echo 1>&2 "\
+WARNING: I can't seem to be able to run \`tar' with the given arguments.
+ You may want to install GNU tar or Free paxutils, or check the
+ command line arguments."
+ exit 1
+ ;;
+
*)
echo 1>&2 "\
-WARNING: \`$1' is needed, and you do not seem to have it handy on your
- system. You might have modified some files without having the
+WARNING: \`$1' is needed, and is $msg.
+ You might have modified some files without having the
proper tools for further handling them. Check the \`README' file,
- it often tells you about the needed prerequirements for installing
+ it often tells you about the needed prerequisites for installing
this package. You may also peek at any GNU archive site, in case
some other package would contain this missing \`$1' program."
exit 1
@@ -188,3 +366,11 @@
esac
exit 0
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
xbmc-9.11-gymcodec.patch:
ym2612.h | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
--- NEW FILE xbmc-9.11-gymcodec.patch ---
diff -Naur xbmc-9.11-11.0/xbmc/cores/paplayer/GYMCodec/ym2612.h xbmc-9.11-11.1/xbmc/cores/paplayer/GYMCodec/ym2612.h
--- xbmc-9.11-11.0/xbmc/cores/paplayer/GYMCodec/ym2612.h 2008-07-15 21:14:31.000000000 +0200
+++ xbmc-9.11-11.1/xbmc/cores/paplayer/GYMCodec/ym2612.h 2010-02-03 07:33:21.000000000 +0100
@@ -15,7 +15,7 @@
#define INLINE __inline
typedef struct slot__ {
- int *DT; // paramètre detune
+ unsigned int *DT; // paramètre detune
int MUL; // paramètre "multiple de fréquence"
int TL; // Total Level = volume lorsque l'enveloppe est au plus haut
int TLL; // Total Level ajusted
@@ -24,10 +24,10 @@
int KSR; // Key Scale Rate = cette valeur est calculée par rapport à la fréquence actuelle, elle va influer
// sur les différents paramètres de l'enveloppe comme l'attaque, le decay ... comme dans la réalité !
int SEG; // Type enveloppe SSG
- int *AR; // Attack Rate (table pointeur) = Taux d'attaque (AR[KSR])
- int *DR; // Decay Rate (table pointeur) = Taux pour la régression (DR[KSR])
- int *SR; // Sustin Rate (table pointeur) = Taux pour le maintien (SR[KSR])
- int *RR; // Release Rate (table pointeur) = Taux pour le relâchement (RR[KSR])
+ unsigned int *AR; // Attack Rate (table pointeur) = Taux d'attaque (AR[KSR])
+ unsigned int *DR; // Decay Rate (table pointeur) = Taux pour la régression (DR[KSR])
+ unsigned int *SR; // Sustin Rate (table pointeur) = Taux pour le maintien (SR[KSR])
+ unsigned int *RR; // Release Rate (table pointeur) = Taux pour le relâchement (RR[KSR])
int Fcnt; // Frequency Count = compteur-fréquence pour déterminer l'amplitude actuelle (SIN[Finc >> 16])
int Finc; // frequency step = pas d'incrémentation du compteur-fréquence
// plus le pas est grand, plus la fréquence est aïgu (ou haute)
xbmc-9.11-hdhomerun.patch:
Makefile.in | 5 --
configure.in | 1
xbmc/FileSystem/HDHomeRun.h | 78 +++++++++++++++++++++++++++++---------------
3 files changed, 53 insertions(+), 31 deletions(-)
--- NEW FILE xbmc-9.11-hdhomerun.patch ---
--- xbmc-9.11/Makefile.in.orig 2010-03-06 13:36:20.065364213 +0100
+++ xbmc-9.11/Makefile.in 2010-03-06 13:36:50.136366154 +0100
@@ -82,7 +82,6 @@
LIB_DIRS=\
xbmc/lib/cximage-6.0 \
xbmc/lib/libexif \
- xbmc/lib/libhdhomerun \
xbmc/lib/libid3tag \
xbmc/lib/libPython/linux
@@ -273,8 +272,6 @@
endif
libexif: dllloader
$(MAKE) -C xbmc/lib/libexif
-libhdhomerun: dllloader
- $(MAKE) -C xbmc/lib/libhdhomerun
libid3tag: dllloader
$(MAKE) -C xbmc/lib/libid3tag
papcodecs: dllloader dvdpcodecs
@@ -304,7 +301,7 @@
$(MAKE) -C xbmc/lib/cximage-6.0
codecs: papcodecs dvdpcodecs
-libs: libhdhomerun libid3tag imagelib libexif python
+libs: libid3tag imagelib libexif python
externals: codecs libs python visualizations screensavers
xcode_depends: \
--- xbmc-9.11/xbmc/FileSystem/HDHomeRun.h.orig 2010-03-06 13:51:33.326488131 +0100
+++ xbmc-9.11/xbmc/FileSystem/HDHomeRun.h 2010-03-06 13:51:53.899488929 +0100
@@ -22,7 +22,7 @@
#include "IDirectory.h"
#include "DynamicDll.h"
-#include "lib/libhdhomerun/hdhomerun.h"
+#include <hdhomerun/hdhomerun.h>
#include "FileSystem/IFile.h"
class DllHdHomeRunInterface
@@ -44,31 +44,57 @@
class DllHdHomeRun : public DllDynamic, public DllHdHomeRunInterface
{
- DECLARE_DLL_WRAPPER(DllHdHomeRun, DLL_PATH_LIBHDHOMERUN)
- DEFINE_METHOD5(int, discover_find_devices_custom, (uint32_t p1, uint32_t p2, uint32_t p3, struct hdhomerun_discover_device_t p4[], int p5))
- DEFINE_METHOD2(struct hdhomerun_device_t*, device_create_from_str, (const char* p1, struct hdhomerun_debug_t *p2))
- DEFINE_METHOD1(void, device_destroy, (struct hdhomerun_device_t* p1))
- DEFINE_METHOD1(int, device_stream_start, (struct hdhomerun_device_t* p1))
- DEFINE_METHOD3(uint8_t*, device_stream_recv, (struct hdhomerun_device_t* p1, unsigned int p2, unsigned int* p3))
- DEFINE_METHOD1(void, device_stream_stop, (struct hdhomerun_device_t* p1))
- DEFINE_METHOD2(int, device_set_tuner_channel, (struct hdhomerun_device_t *p1, const char *p2))
- DEFINE_METHOD2(int, device_set_tuner_program, (struct hdhomerun_device_t *p1, const char *p2))
- DEFINE_METHOD2(int, device_set_tuner_from_str, (struct hdhomerun_device_t *p1, const char *p2))
- DEFINE_METHOD2(void, device_set_tuner, (struct hdhomerun_device_t *p1, unsigned int p2))
- DEFINE_METHOD3(int, device_get_tuner_status, (struct hdhomerun_device_t *p1, char **p2, struct hdhomerun_tuner_status_t *p3));
- BEGIN_METHOD_RESOLVE()
- RESOLVE_METHOD_RENAME(hdhomerun_discover_find_devices_custom, discover_find_devices_custom)
- RESOLVE_METHOD_RENAME(hdhomerun_device_create_from_str, device_create_from_str)
- RESOLVE_METHOD_RENAME(hdhomerun_device_destroy, device_destroy)
- RESOLVE_METHOD_RENAME(hdhomerun_device_stream_start, device_stream_start)
- RESOLVE_METHOD_RENAME(hdhomerun_device_stream_recv, device_stream_recv)
- RESOLVE_METHOD_RENAME(hdhomerun_device_stream_stop, device_stream_stop)
- RESOLVE_METHOD_RENAME(hdhomerun_device_set_tuner_channel, device_set_tuner_channel)
- RESOLVE_METHOD_RENAME(hdhomerun_device_set_tuner_program, device_set_tuner_program)
- RESOLVE_METHOD_RENAME(hdhomerun_device_set_tuner_from_str, device_set_tuner_from_str)
- RESOLVE_METHOD_RENAME(hdhomerun_device_set_tuner, device_set_tuner)
- RESOLVE_METHOD_RENAME(hdhomerun_device_get_tuner_status, device_get_tuner_status)
- END_METHOD_RESOLVE()
+public:
+ virtual ~DllHdHomeRun () {};
+
+ virtual int discover_find_devices_custom (uint32_t p1, uint32_t p2, uint32_t p3, struct hdhomerun_discover_device_t p4[], int p5)
+ { return ::hdhomerun_discover_find_devices_custom (p1, p2, p3, p4, p5); }
+
+ virtual struct hdhomerun_device_t *device_create_from_str (const char* p1, struct hdhomerun_debug_t *p2)
+ { return ::hdhomerun_device_create_from_str (p1, p2); }
+
+ virtual void device_destroy (struct hdhomerun_device_t* p1)
+ { ::hdhomerun_device_destroy (p1); }
+
+ virtual int device_stream_start (struct hdhomerun_device_t* p1)
+ { return ::hdhomerun_device_stream_start (p1); }
+
+
+ virtual uint8_t *device_stream_recv (struct hdhomerun_device_t* p1, unsigned int p2, unsigned int* p3)
+ {
+ uint8_t *retval;
+
+ size_t tmp = *p3;
+ retval = ::hdhomerun_device_stream_recv (p1, p2, &tmp);
+ *p3 = tmp;
+
+ return retval;
+ }
+
+ virtual void device_stream_stop (struct hdhomerun_device_t* p1)
+ { ::hdhomerun_device_stream_stop (p1); }
+
+ virtual int device_set_tuner_channel (struct hdhomerun_device_t *p1, const char *p2)
+ { return ::hdhomerun_device_set_tuner_channel (p1, p2); }
+
+ virtual int device_set_tuner_program (struct hdhomerun_device_t *p1, const char *p2)
+ { return ::hdhomerun_device_set_tuner_program (p1, p2); }
+
+
+ virtual int device_set_tuner_from_str (struct hdhomerun_device_t *p1, const char *p2)
+ { return ::hdhomerun_device_set_tuner_from_str (p1, p2); }
+
+
+ virtual void device_set_tuner (struct hdhomerun_device_t *p1, unsigned int p2)
+ { ::hdhomerun_device_set_tuner (p1, p2); }
+
+ virtual int device_get_tuner_status (struct hdhomerun_device_t *p1, char **p2, struct hdhomerun_tuner_status_t *p3)
+ { return ::hdhomerun_device_get_tuner_status (p1, p2, p3); }
+
+ // DLL faking.
+ virtual bool ResolveExports() { return true; }
+ virtual bool Load() { return true; }
+ virtual void Unload() {}
};
namespace DIRECTORY
--- xbmc-9.11/configure.in.orig 2010-03-06 13:44:45.670365692 +0100
+++ xbmc-9.11/configure.in 2010-03-06 13:44:57.298492458 +0100
@@ -989,7 +989,6 @@
xbmc/lib/libRTV/Makefile \
xbmc/lib/libexif/Makefile \
xbmc/lib/libXDAAP/Makefile \
- xbmc/lib/libhdhomerun/Makefile \
xbmc/lib/libshout/Makefile \
xbmc/lib/libsquish/Makefile \
xbmc/lib/libid3tag/Makefile \
xbmc-9.11-libdca.patch:
configure.in | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
--- NEW FILE xbmc-9.11-libdca.patch ---
--- xbmc-9.11-b1/configure.in.config 2009-11-18 02:47:48.000000000 +0100
+++ xbmc-9.11-b1/configure.in 2009-11-25 20:25:05.973069389 +0100
@@ -560,7 +560,7 @@
# External libdts
if test "$use_external_libraries" = "yes" || test "$use_external_libdts" = "yes"; then
- AC_CHECK_LIB([dts], [main],, AC_MSG_ERROR($missing_library))
+ AC_CHECK_LIB([dca], [main],, AC_MSG_ERROR($missing_library))
AC_MSG_NOTICE($external_libdts_enabled)
USE_EXTERNAL_LIBDTS=1
@@ -1054,6 +1054,8 @@
if [[ $3 != "1" ]]; then
if [[ -d $1 ]]; then
pushd $1
+ [[ -f configure ]] && chmod +x configure
+ [[ -f configure2 ]] && chmod +x configure2
$2
if [[ $? -ne 0 ]]; then
popd
xbmc-9.11-libid3tag.patch:
metadata.c | 3 +++
1 file changed, 3 insertions(+)
--- NEW FILE xbmc-9.11-libid3tag.patch ---
diff -Naur xbmc-9.11-11.0/xbmc/lib/libid3tag/libid3tag/metadata.c xbmc-9.11-11.1/xbmc/lib/libid3tag/libid3tag/metadata.c
--- xbmc-9.11-11.0/xbmc/lib/libid3tag/libid3tag/metadata.c 2009-10-13 02:48:48.000000000 +0200
+++ xbmc-9.11-11.1/xbmc/lib/libid3tag/libid3tag/metadata.c 2010-02-03 07:33:21.000000000 +0100
@@ -23,6 +23,9 @@
# include "config.h"
# endif
+#include <string.h>
+#include <stdlib.h>
+
# include "metadata.h"
# include "global.h"
# include "ucs4.h"
xbmc-9.11-librtv.patch:
Makefile.in | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE xbmc-9.11-librtv.patch ---
diff -Naur xbmc-9.11-11.0/xbmc/lib/libRTV/Makefile.in xbmc-9.11-11.1/xbmc/lib/libRTV/Makefile.in
--- xbmc-9.11-11.0/xbmc/lib/libRTV/Makefile.in 2009-03-22 19:56:49.000000000 +0100
+++ xbmc-9.11-11.1/xbmc/lib/libRTV/Makefile.in 2010-02-03 07:33:21.000000000 +0100
@@ -1,7 +1,7 @@
SRCS=crypt.c guideclient.c GuideParser.c httpclient.c httpfsclient.c interface.c md5.c netclient.c rtv.c sleep.c
-CFLAGS += -D_LINUX -D__unix__
-CXXFLAGS += -D_LINUX -D__unix__
+CFLAGS += -D_LINUX
+CXXFLAGS += -D_LINUX
LIB= librtv-@ARCH@.a
xbmc-9.11-macdll.patch:
Makefile.in | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE xbmc-9.11-macdll.patch ---
diff -Naur xbmc-9.11-11.0/xbmc/cores/paplayer/MACDll/Makefile.in xbmc-9.11-11.1/xbmc/cores/paplayer/MACDll/Makefile.in
--- xbmc-9.11-11.0/xbmc/cores/paplayer/MACDll/Makefile.in 2010-02-03 07:34:17.000000000 +0100
+++ xbmc-9.11-11.1/xbmc/cores/paplayer/MACDll/Makefile.in 2010-02-03 07:33:21.000000000 +0100
@@ -35,8 +35,8 @@
Source/MACLib/Old/AntiPredictorNormal.o \
Source/MACDll/MACDll.o
-CFLAGS +=-ISource/Shared -DPIC -fPIC -ISource/MACLib -pedantic -D__GNUC_IA32__ -DBUILD_CROSS_PLATFORM -D_LINUX
-CXXFLAGS +=-ISource/Shared -DPIC -fPIC -ISource/MACLib -pedantic -D__GNUC_IA32__ -DBUILD_CROSS_PLATFORM -D_LINUX
+CFLAGS +=-ISource/Shared -DPIC -fPIC -ISource/MACLib -D__GNUC_IA32__ -DBUILD_CROSS_PLATFORM -D_LINUX
+CXXFLAGS +=-ISource/Shared -DPIC -fPIC -ISource/MACLib -D__GNUC_IA32__ -DBUILD_CROSS_PLATFORM -D_LINUX
ARCH=@ARCH@
xbmc-9.11-maclib.patch:
Prepare.cpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--- NEW FILE xbmc-9.11-maclib.patch ---
diff -Naur xbmc-9.11-11.0/xbmc/cores/paplayer/MACDll/Source/MACLib/Prepare.cpp xbmc-9.11-11.1/xbmc/cores/paplayer/MACDll/Source/MACLib/Prepare.cpp
--- xbmc-9.11-11.0/xbmc/cores/paplayer/MACDll/Source/MACLib/Prepare.cpp 2008-07-15 21:14:31.000000000 +0200
+++ xbmc-9.11-11.1/xbmc/cores/paplayer/MACDll/Source/MACLib/Prepare.cpp 2010-02-03 07:33:21.000000000 +0100
@@ -1,9 +1,9 @@
#include "All.h"
#include "Prepare.h"
-const uint32 CRC32_TABLE[256] = {0,1996959894,3993919788,2567524794,124634137,1886057615,3915621685,2657392035,249268274,2044508324,3772115230,2547177864,162941995,2125561021,3887607047,2428444049,498536548,1789927666,4089016648,2227061214,450548861,1843258603,4107580753,2211677639,325883990,1684777152,4251122042,2321926636,335633487,1661365465,4195302755,2366115317,997073096,1281953886,3579855332,2724688242,1006888145,1258607687,3524101629,2768942443,901097722,1119000684,3686517206,2898065728,853044451,1172266101,3705015759,2882616665,651767980,1373503546,3369554304,3218104598,565507253,1454621731,3485111705,3099436303,671266974,1594198024,3322730930,2970347812,795835527,1483230225,3244367275,3060149565,1994146192,31158534,2563907772,4023717930,1907459465,112637215,2680153253,3904427059,2013776290,251722036,2517215374,3775830040,2137656763,141376813,2439277719,3865271297,1802195444,476864866,2238001368,
- 4066508878,1812370925,453092731,2181625025,4111451223,1706088902,314042704,2344532202,4240017532,1658658271,366619977,2362670323,4224994405,1303535960,984961486,2747007092,3569037538,1256170817,1037604311,2765210733,3554079995,1131014506,879679996,2909243462,3663771856,1141124467,855842277,2852801631,3708648649,1342533948,654459306,3188396048,3373015174,1466479909,544179635,3110523913,3462522015,1591671054,702138776,2966460450,3352799412,1504918807,783551873,3082640443,3233442989,3988292384,2596254646,62317068,1957810842,3939845945,2647816111,81470997,1943803523,3814918930,2489596804,225274430,2053790376,3826175755,2466906013,167816743,2097651377,4027552580,2265490386,503444072,1762050814,4150417245,2154129355,426522225,1852507879,4275313526,2312317920,282753626,1742555852,4189708143,2394877945,397917763,1622183637,3604390888,2714866558,953729732,1340076626,3518719985,2797360999,1068828381,1219638859,3624741850,
- 2936675148,906185462,1090812512,3747672003,2825379669,829329135,1181335161,3412177804,3160834842,628085408,1382605366,3423369109,3138078467,570562233,1426400815,3317316542,2998733608,733239954,1555261956,3268935591,3050360625,752459403,1541320221,2607071920,3965973030,1969922972,40735498,2617837225,3943577151,1913087877,83908371,2512341634,3803740692,2075208622,213261112,2463272603,3855990285,2094854071,198958881,2262029012,4057260610,1759359992,534414190,2176718541,4139329115,1873836001,414664567,2282248934,4279200368,1711684554,285281116,2405801727,4167216745,1634467795,376229701,2685067896,3608007406,1308918612,956543938,2808555105,3495958263,1231636301,1047427035,2932959818,3654703836,1088359270,936918000,2847714899,3736837829,1202900863,817233897,3183342108,3401237130,1404277552,615818150,3134207493,3453421203,1423857449,601450431,3009837614,3294710456,1567103746,711928724,3020668471,3272380065,1510334235,755167117};
+const uint32 CRC32_TABLE[256] = {0U,1996959894U,3993919788U,2567524794U,124634137U,1886057615U,3915621685U,2657392035U,249268274U,2044508324U,3772115230U,2547177864U,162941995U,2125561021U,3887607047U,2428444049U,498536548U,1789927666U,4089016648U,2227061214U,450548861U,1843258603U,4107580753U,2211677639U,325883990U,1684777152U,4251122042U,2321926636U,335633487U,1661365465U,4195302755U,2366115317U,997073096U,1281953886U,3579855332U,2724688242U,1006888145U,1258607687U,3524101629U,2768942443U,901097722U,1119000684U,3686517206U,2898065728U,853044451U,1172266101U,3705015759U,2882616665U,651767980U,1373503546U,3369554304U,3218104598U,565507253U,1454621731U,3485111705U,3099436303U,671266974U,1594198024U,3322730930U,2970347812U,795835527U,1483230225U,3244367275U,3060149565U,1994146192U,31158534U,2563907772U,4023717930U,1907459465U,112637215U,2680153253U,3904427059U,2013776290U,251722036U,2517215374U,3775830040U,2137656763U,141376813U,2439277719U,3865271297U,1802195444U,476864866U,2
238001368U,
+ 4066508878U,1812370925U,453092731U,2181625025U,4111451223U,1706088902U,314042704U,2344532202U,4240017532U,1658658271U,366619977U,2362670323U,4224994405U,1303535960U,984961486U,2747007092U,3569037538U,1256170817U,1037604311U,2765210733U,3554079995U,1131014506U,879679996U,2909243462U,3663771856U,1141124467U,855842277U,2852801631U,3708648649U,1342533948U,654459306U,3188396048U,3373015174U,1466479909U,544179635U,3110523913U,3462522015U,1591671054U,702138776U,2966460450U,3352799412U,1504918807U,783551873U,3082640443U,3233442989U,3988292384U,2596254646U,62317068U,1957810842U,3939845945U,2647816111U,81470997U,1943803523U,3814918930U,2489596804U,225274430U,2053790376U,3826175755U,2466906013U,167816743U,2097651377U,4027552580U,2265490386U,503444072U,1762050814U,4150417245U,2154129355U,426522225U,1852507879U,4275313526U,2312317920U,282753626U,1742555852U,4189708143U,2394877945U,397917763U,1622183637U,3604390888U,2714866558U,953729732U,1340076626U,3518719985U,2797360999U,1068828381
U,1219638859U,3624741850U,
+ 2936675148U,906185462U,1090812512U,3747672003U,2825379669U,829329135U,1181335161U,3412177804U,3160834842U,628085408U,1382605366U,3423369109U,3138078467U,570562233U,1426400815U,3317316542U,2998733608U,733239954U,1555261956U,3268935591U,3050360625U,752459403U,1541320221U,2607071920U,3965973030U,1969922972U,40735498U,2617837225U,3943577151U,1913087877U,83908371U,2512341634U,3803740692U,2075208622U,213261112U,2463272603U,3855990285U,2094854071U,198958881U,2262029012U,4057260610U,1759359992U,534414190U,2176718541U,4139329115U,1873836001U,414664567U,2282248934U,4279200368U,1711684554U,285281116U,2405801727U,4167216745U,1634467795U,376229701U,2685067896U,3608007406U,1308918612U,956543938U,2808555105U,3495958263U,1231636301U,1047427035U,2932959818U,3654703836U,1088359270U,936918000U,2847714899U,3736837829U,1202900863U,817233897U,3183342108U,3401237130U,1404277552U,615818150U,3134207493U,3453421203U,1423857449U,601450431U,3009837614U,3294710456U,1567103746U,711928724U,3020668471U
,3272380065U,1510334235U,755167117U};
int CPrepare::Prepare(const unsigned char * pRawData, int nBytes, const WAVEFORMATEX * pWaveFormatEx, int * pOutputX, int *pOutputY, unsigned int *pCRC, int *pSpecialCodes, int *pPeakLevel)
{
xbmc-9.11-remlibass.patch:
Makefile.in | 6 ------
configure.in | 1 -
2 files changed, 7 deletions(-)
--- NEW FILE xbmc-9.11-remlibass.patch ---
--- xbmc-9.11/configure.in.orig 2010-01-02 18:20:48.334073413 +0100
+++ xbmc-9.11/configure.in 2010-01-02 18:50:21.184073054 +0100
@@ -962,7 +962,6 @@
xbmc/cores/paplayer/WavPackCodec/Makefile \
xbmc/cores/paplayer/YMCodec/StSoundLibrary/Makefile \
guilib/common/Makefile \
- xbmc/lib/libass/xbmc/Makefile \
xbmc/lib/libXBMS/Makefile \
xbmc/lib/libRTV/Makefile \
xbmc/lib/libexif/Makefile \
--- xbmc-9.11/Makefile.in.orig 2010-01-02 17:25:20.723105079 +0100
+++ xbmc-9.11/Makefile.in 2010-01-02 17:25:53.640198700 +0100
@@ -58,9 +58,6 @@
DVDPCODECS_DIRS= \
xbmc/cores/dvdplayer/Codecs \
xbmc/cores/dvdplayer/Codecs/libdvd
-ifneq (@USE_EXTERNAL_LIBASS@,1)
- DVDPCODECS_DIRS+=xbmc/lib/libass/xbmc
-endif
PAPCODECS_DIRS= \
xbmc/cores/paplayer/AC3Codec \
@@ -268,9 +265,6 @@
dvdpcodecs: dllloader
$(MAKE) -C xbmc/cores/dvdplayer/Codecs
$(MAKE) -C xbmc/cores/dvdplayer/Codecs/libdvd
-ifneq (@USE_EXTERNAL_LIBASS@,1)
- $(MAKE) -C xbmc/lib/libass/xbmc
-endif
eventclients:
ifeq ($(findstring osx,$(ARCH)), osx)
$(MAKE) -C tools/EventClients/Clients/OSXRemote
xbmc-9.11-remove-goahead.patch:
Makefile.in | 7 +------
configure.in | 1 -
guilib/system.h | 2 +-
3 files changed, 2 insertions(+), 8 deletions(-)
--- NEW FILE xbmc-9.11-remove-goahead.patch ---
--- configure.in.orig 2010-03-06 04:48:49.233198314 -0500
+++ configure.in 2010-03-06 04:51:02.297020657 -0500
@@ -990,7 +990,6 @@
xbmc/lib/libexif/Makefile \
xbmc/lib/libXDAAP/Makefile \
xbmc/lib/libhdhomerun/Makefile \
- xbmc/lib/libGoAhead/Makefile \
xbmc/lib/libshout/Makefile \
xbmc/lib/libsquish/Makefile \
xbmc/lib/libid3tag/Makefile \
--- Makefile.in.orig 2010-03-06 04:49:38.948896140 -0500
+++ Makefile.in 2010-03-06 04:50:24.628895410 -0500
@@ -29,7 +29,6 @@
xbmc/karaoke \
xbmc/lib/libcmyth \
xbmc/lib/libhts \
- xbmc/lib/libGoAhead \
xbmc/lib/libPython \
xbmc/lib/libPython/xbmcmodule \
xbmc/lib/libRTMP \
@@ -219,8 +218,6 @@
$(MAKE) -C xbmc/lib/libXBMS
xbmc/lib/libXDAAP/libxdaap-@ARCH@.a: force
$(MAKE) -C xbmc/lib/libXDAAP
-xbmc/lib/libGoAhead/libGoAhead-@ARCH@.a: force
- $(MAKE) -C xbmc/lib/libGoAhead
xbmc/lib/sqLite/sqllite.a: force
$(MAKE) -C xbmc/lib/sqLite
xbmc/lib/UnrarXLib/UnrarXLib.a: force
@@ -315,8 +312,7 @@
xbmc/lib/libXBMS/libxbms-@ARCH@.a \
xbmc/lib/libRTV/librtv-@ARCH@.a \
xbmc/lib/libXDAAP/libxdaap-@ARCH@.a \
- xbmc/lib/libshout/libshout-@ARCH@.a \
- xbmc/lib/libGoAhead/libGoAhead-@ARCH@.a
+ xbmc/lib/libshout/libshout-@ARCH@.a
# platform independend objects
OBJSXBMC= \
@@ -355,7 +351,6 @@
xbmc/lib/libUPnP/libupnp-@ARCH@.a \
xbmc/lib/libXBMS/libxbms-@ARCH@.a \
xbmc/lib/libXDAAP/libxdaap-@ARCH@.a \
- xbmc/lib/libGoAhead/libGoAhead-@ARCH@.a \
xbmc/lib/sqLite/sqllite.a \
xbmc/lib/libsquish/libsquish-@ARCH@.a \
xbmc/screensavers/screensaver.a \
--- guilib/system.h.orig 2010-03-06 05:42:46.227020727 -0500
+++ guilib/system.h 2010-03-06 05:44:35.429895860 -0500
@@ -44,7 +44,7 @@
#define HAS_UPNP
#define HAS_VIDEO_PLAYBACK
#define HAS_VISUALISATION
-#define HAS_WEB_SERVER
+/* undef HAS_WEB_SERVER */
#define HAS_AC3_CODEC
#define HAS_DTS_CODEC
xbmc-9.11-rsxs-0.9.diff:
configure.in | 6 ++++--
xbmc/screensavers/rsxs-0.9/configure | 8 ++++----
xbmc/screensavers/rsxs-0.9/configure.ac | 8 ++++----
xbmc/screensavers/rsxs-0.9/src/Makefile.common | 2 +-
xbmc/screensavers/rsxs-0.9/src/cyclone/Makefile.in | 2 +-
xbmc/screensavers/rsxs-0.9/src/euphoria/Makefile.in | 2 +-
xbmc/screensavers/rsxs-0.9/src/fieldlines/Makefile.in | 2 +-
xbmc/screensavers/rsxs-0.9/src/flocks/Makefile.in | 2 +-
xbmc/screensavers/rsxs-0.9/src/flux/Makefile.in | 2 +-
xbmc/screensavers/rsxs-0.9/src/helios/Makefile.in | 2 +-
xbmc/screensavers/rsxs-0.9/src/hyperspace/Makefile.in | 2 +-
xbmc/screensavers/rsxs-0.9/src/lattice/Makefile.in | 2 +-
xbmc/screensavers/rsxs-0.9/src/plasma/Makefile.in | 2 +-
xbmc/screensavers/rsxs-0.9/src/skyrocket/Makefile.in | 2 +-
xbmc/screensavers/rsxs-0.9/src/solarwinds/Makefile.in | 2 +-
15 files changed, 24 insertions(+), 22 deletions(-)
--- NEW FILE xbmc-9.11-rsxs-0.9.diff ---
diff -Naur xbmc-9.11-8.3/configure.in xbmc-9.11-8.4/configure.in
--- xbmc-9.11-8.3/configure.in 2010-01-22 11:06:37.000000000 +0100
+++ xbmc-9.11-8.4/configure.in 2010-01-24 06:05:15.000000000 +0100
@@ -1363,8 +1363,10 @@
--disable-skyrocket
else
./configure \
- CFLAGS="-fPIC" \
- CXXFLAGS="-fPIC" \
+ CPPFLAGS="$CPPFLAGS" \
+ CFLAGS="$CFLAGS -fPIC" \
+ CXXFLAGS="$CXXFLAGS -fPIC" \
+ --prefix="${prefix}" --includedir="${includedir}" --libdir="${libdir}" --datadir="${datadir}" \
--without-xscreensaver \
--disable-sound \
--disable-cyclone \
diff -Naur xbmc-9.11-8.3/xbmc/screensavers/rsxs-0.9/configure xbmc-9.11-8.4/xbmc/screensavers/rsxs-0.9/configure
--- xbmc-9.11-8.3/xbmc/screensavers/rsxs-0.9/configure 2008-07-20 17:54:35.000000000 +0200
+++ xbmc-9.11-8.4/xbmc/screensavers/rsxs-0.9/configure 2010-01-24 06:03:38.000000000 +0100
@@ -3241,7 +3241,7 @@
fi
-CXXFLAGS=`echo $CXXFLAGS | sed -e s,-O2,-O3,`
+#CXXFLAGS=`echo $CXXFLAGS | sed -e s,-O2,-O3,`
ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -3469,9 +3469,9 @@
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-if test x"$GXX" = x"yes"; then
- CXXFLAGS=`echo $CXXFLAGS -Wall`
-fi
+#if test x"$GXX" = x"yes"; then
+# CXXFLAGS=`echo $CXXFLAGS -Wall`
+#fi
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
diff -Naur xbmc-9.11-8.3/xbmc/screensavers/rsxs-0.9/configure.ac xbmc-9.11-8.4/xbmc/screensavers/rsxs-0.9/configure.ac
--- xbmc-9.11-8.3/xbmc/screensavers/rsxs-0.9/configure.ac 2007-10-08 19:37:14.000000000 +0200
+++ xbmc-9.11-8.4/xbmc/screensavers/rsxs-0.9/configure.ac 2010-01-24 06:03:38.000000000 +0100
@@ -16,12 +16,12 @@
LT_AC_PROG_SED
AC_LANG(C++)
AC_PROG_CXX
-CXXFLAGS=`echo $CXXFLAGS | sed -e s,-O2,-O3,`
+#CXXFLAGS=`echo $CXXFLAGS | sed -e s,-O2,-O3,`
AC_PROG_CXXCPP
-if test x"$GXX" = x"yes"; then
- CXXFLAGS=`echo $CXXFLAGS -Wall`
-fi
+#if test x"$GXX" = x"yes"; then
+# CXXFLAGS=`echo $CXXFLAGS -Wall`
+#fi
AC_PROG_CC
AM_PROG_CC_C_O
diff -Naur xbmc-9.11-8.3/xbmc/screensavers/rsxs-0.9/src/cyclone/Makefile.in xbmc-9.11-8.4/xbmc/screensavers/rsxs-0.9/src/cyclone/Makefile.in
--- xbmc-9.11-8.3/xbmc/screensavers/rsxs-0.9/src/cyclone/Makefile.in 2009-01-24 23:51:01.000000000 +0100
+++ xbmc-9.11-8.4/xbmc/screensavers/rsxs-0.9/src/cyclone/Makefile.in 2010-01-24 06:03:38.000000000 +0100
@@ -278,7 +278,7 @@
@DLOPEN_TRUE@LIBLTDL_CPPFLAGS = -I$(top_builddir)/libltdl
AM_CPPFLAGS = -DPKGDATADIR=\"$(pkgdatadir)\" -I$(srcdir)/.. -I$(top_srcdir)/lib $(X_CPPFLAGS)
AM_LDFLAGS =
-AM_CXXFLAGS = -Wall -funroll-loops
+AM_CXXFLAGS =
AM_ETAGSFLAGS = --extra=fq
rs_cyclone_SOURCES = $(COMMON) $(COLOR) $(VECTOR) blend.cc blend.hh cyclone.cc \
cyclone.hh particle.cc particle.hh
diff -Naur xbmc-9.11-8.3/xbmc/screensavers/rsxs-0.9/src/euphoria/Makefile.in xbmc-9.11-8.4/xbmc/screensavers/rsxs-0.9/src/euphoria/Makefile.in
--- xbmc-9.11-8.3/xbmc/screensavers/rsxs-0.9/src/euphoria/Makefile.in 2009-01-24 23:51:01.000000000 +0100
+++ xbmc-9.11-8.4/xbmc/screensavers/rsxs-0.9/src/euphoria/Makefile.in 2010-01-24 06:03:38.000000000 +0100
@@ -290,7 +290,7 @@
AM_CPPFLAGS = -DPKGDATADIR=\"$(pkgdatadir)\" -I$(srcdir)/.. \
-I$(top_srcdir)/lib $(X_CPPFLAGS) $(IMAGE_CPPFLAGS)
AM_LDFLAGS = $(IMAGE_LDFLAGS)
-AM_CXXFLAGS = -Wall -funroll-loops $(IMAGE_CXXFLAGS)
+AM_CXXFLAGS = $(IMAGE_CXXFLAGS)
AM_ETAGSFLAGS = --extra=fq
rs_euphoria_SOURCES = $(COMMON) $(COLOR) $(VECTOR) $(IMAGE) euphoria.cc \
euphoria.hh wisp.cc wisp.hh
diff -Naur xbmc-9.11-8.3/xbmc/screensavers/rsxs-0.9/src/fieldlines/Makefile.in xbmc-9.11-8.4/xbmc/screensavers/rsxs-0.9/src/fieldlines/Makefile.in
--- xbmc-9.11-8.3/xbmc/screensavers/rsxs-0.9/src/fieldlines/Makefile.in 2009-01-24 23:51:01.000000000 +0100
+++ xbmc-9.11-8.4/xbmc/screensavers/rsxs-0.9/src/fieldlines/Makefile.in 2010-01-24 06:03:38.000000000 +0100
@@ -277,7 +277,7 @@
@DLOPEN_TRUE@LIBLTDL_CPPFLAGS = -I$(top_builddir)/libltdl
AM_CPPFLAGS = -DPKGDATADIR=\"$(pkgdatadir)\" -I$(srcdir)/.. -I$(top_srcdir)/lib $(X_CPPFLAGS)
AM_LDFLAGS =
-AM_CXXFLAGS = -Wall -funroll-loops
+AM_CXXFLAGS =
AM_ETAGSFLAGS = --extra=fq
rs_fieldlines_SOURCES = $(COMMON) $(COLOR) $(VECTOR) fieldlines.cc \
fieldlines.hh ion.hh
diff -Naur xbmc-9.11-8.3/xbmc/screensavers/rsxs-0.9/src/flocks/Makefile.in xbmc-9.11-8.4/xbmc/screensavers/rsxs-0.9/src/flocks/Makefile.in
--- xbmc-9.11-8.3/xbmc/screensavers/rsxs-0.9/src/flocks/Makefile.in 2009-01-24 23:51:01.000000000 +0100
+++ xbmc-9.11-8.4/xbmc/screensavers/rsxs-0.9/src/flocks/Makefile.in 2010-01-24 06:03:38.000000000 +0100
@@ -277,7 +277,7 @@
@DLOPEN_TRUE@LIBLTDL_CPPFLAGS = -I$(top_builddir)/libltdl
AM_CPPFLAGS = -DPKGDATADIR=\"$(pkgdatadir)\" -I$(srcdir)/.. -I$(top_srcdir)/lib $(X_CPPFLAGS)
AM_LDFLAGS =
-AM_CXXFLAGS = -Wall -funroll-loops
+AM_CXXFLAGS =
AM_ETAGSFLAGS = --extra=fq
rs_flocks_SOURCES = $(COMMON) $(COLOR) $(VECTOR) bug.cc bug.hh flocks.cc \
flocks.hh
diff -Naur xbmc-9.11-8.3/xbmc/screensavers/rsxs-0.9/src/flux/Makefile.in xbmc-9.11-8.4/xbmc/screensavers/rsxs-0.9/src/flux/Makefile.in
--- xbmc-9.11-8.3/xbmc/screensavers/rsxs-0.9/src/flux/Makefile.in 2009-01-24 23:51:01.000000000 +0100
+++ xbmc-9.11-8.4/xbmc/screensavers/rsxs-0.9/src/flux/Makefile.in 2010-01-24 06:03:38.000000000 +0100
@@ -277,7 +277,7 @@
@DLOPEN_TRUE@LIBLTDL_CPPFLAGS = -I$(top_builddir)/libltdl
AM_CPPFLAGS = -DPKGDATADIR=\"$(pkgdatadir)\" -I$(srcdir)/.. -I$(top_srcdir)/lib $(X_CPPFLAGS)
AM_LDFLAGS =
-AM_CXXFLAGS = -Wall -funroll-loops
+AM_CXXFLAGS =
AM_ETAGSFLAGS = --extra=fq
rs_flux_SOURCES = $(COMMON) $(COLOR) $(VECTOR) flux.cc flux.hh trail.cc trail.hh
rs_flux_LDADD = $(LIBMISC) $(X_LIBS) $(OPENGL_LIBS)
diff -Naur xbmc-9.11-8.3/xbmc/screensavers/rsxs-0.9/src/helios/Makefile.in xbmc-9.11-8.4/xbmc/screensavers/rsxs-0.9/src/helios/Makefile.in
--- xbmc-9.11-8.3/xbmc/screensavers/rsxs-0.9/src/helios/Makefile.in 2009-01-24 23:51:01.000000000 +0100
+++ xbmc-9.11-8.4/xbmc/screensavers/rsxs-0.9/src/helios/Makefile.in 2010-01-24 06:03:38.000000000 +0100
@@ -290,7 +290,7 @@
AM_CPPFLAGS = -DPKGDATADIR=\"$(pkgdatadir)\" -I$(srcdir)/.. \
-I$(top_srcdir)/lib $(X_CPPFLAGS) $(IMAGE_CPPFLAGS)
AM_LDFLAGS = $(IMAGE_LDFLAGS)
-AM_CXXFLAGS = -Wall -funroll-loops $(IMAGE_CXXFLAGS)
+AM_CXXFLAGS = $(IMAGE_CXXFLAGS)
AM_ETAGSFLAGS = --extra=fq
rs_helios_SOURCES = $(COMMON) $(COLOR) $(VECTOR) $(IMAGE) $(IMPLICIT) \
helios.cc helios.hh particle.cc particle.hh sphere.hh
diff -Naur xbmc-9.11-8.3/xbmc/screensavers/rsxs-0.9/src/hyperspace/Makefile.in xbmc-9.11-8.4/xbmc/screensavers/rsxs-0.9/src/hyperspace/Makefile.in
--- xbmc-9.11-8.3/xbmc/screensavers/rsxs-0.9/src/hyperspace/Makefile.in 2009-01-24 23:51:01.000000000 +0100
+++ xbmc-9.11-8.4/xbmc/screensavers/rsxs-0.9/src/hyperspace/Makefile.in 2010-01-24 06:03:38.000000000 +0100
@@ -295,7 +295,7 @@
AM_CPPFLAGS = -DPKGDATADIR=\"$(pkgdatadir)\" -I$(srcdir)/.. \
-I$(top_srcdir)/lib $(X_CPPFLAGS) $(IMAGE_CPPFLAGS)
AM_LDFLAGS = $(IMAGE_LDFLAGS)
-AM_CXXFLAGS = -Wall -funroll-loops $(IMAGE_CXXFLAGS)
+AM_CXXFLAGS = $(IMAGE_CXXFLAGS)
AM_ETAGSFLAGS = --extra=fq
rs_hyperspace_SOURCES = $(COMMON) $(COLOR) $(VECTOR) $(IMPLICIT) $(IMAGE) \
caustic.cc caustic.hh cubemaps.cc cubemaps.hh extensions.cc extensions.hh \
diff -Naur xbmc-9.11-8.3/xbmc/screensavers/rsxs-0.9/src/lattice/Makefile.in xbmc-9.11-8.4/xbmc/screensavers/rsxs-0.9/src/lattice/Makefile.in
--- xbmc-9.11-8.3/xbmc/screensavers/rsxs-0.9/src/lattice/Makefile.in 2009-01-24 23:51:01.000000000 +0100
+++ xbmc-9.11-8.4/xbmc/screensavers/rsxs-0.9/src/lattice/Makefile.in 2010-01-24 06:03:38.000000000 +0100
@@ -287,7 +287,7 @@
AM_CPPFLAGS = -DPKGDATADIR=\"$(pkgdatadir)\" -I$(srcdir)/.. \
-I$(top_srcdir)/lib $(X_CPPFLAGS) $(IMAGE_CPPFLAGS)
AM_LDFLAGS = $(IMAGE_LDFLAGS)
-AM_CXXFLAGS = -Wall -funroll-loops $(IMAGE_CXXFLAGS)
+AM_CXXFLAGS = $(IMAGE_CXXFLAGS)
AM_ETAGSFLAGS = --extra=fq
rs_lattice_SOURCES = $(COMMON) $(VECTOR) $(IMAGE) camera.hh lattice.cc \
lattice.hh resources.cc resources.hh
diff -Naur xbmc-9.11-8.3/xbmc/screensavers/rsxs-0.9/src/Makefile.common xbmc-9.11-8.4/xbmc/screensavers/rsxs-0.9/src/Makefile.common
--- xbmc-9.11-8.3/xbmc/screensavers/rsxs-0.9/src/Makefile.common 2007-10-08 19:37:14.000000000 +0200
+++ xbmc-9.11-8.4/xbmc/screensavers/rsxs-0.9/src/Makefile.common 2010-01-24 06:03:38.000000000 +0100
@@ -18,7 +18,7 @@
AM_CPPFLAGS = -DPKGDATADIR=\"$(pkgdatadir)\" -I$(srcdir)/.. -I$(top_srcdir)/lib $(X_CPPFLAGS) -D_LINUX -DXBMC
AM_LDFLAGS =
-AM_CXXFLAGS = -Wall -funroll-loops
+AM_CXXFLAGS =
AM_ETAGSFLAGS = --extra=fq
diff -Naur xbmc-9.11-8.3/xbmc/screensavers/rsxs-0.9/src/plasma/Makefile.in xbmc-9.11-8.4/xbmc/screensavers/rsxs-0.9/src/plasma/Makefile.in
--- xbmc-9.11-8.3/xbmc/screensavers/rsxs-0.9/src/plasma/Makefile.in 2009-01-24 23:51:01.000000000 +0100
+++ xbmc-9.11-8.4/xbmc/screensavers/rsxs-0.9/src/plasma/Makefile.in 2010-01-24 06:03:38.000000000 +0100
@@ -274,7 +274,7 @@
@DLOPEN_TRUE@LIBLTDL_CPPFLAGS = -I$(top_builddir)/libltdl
AM_CPPFLAGS = -DPKGDATADIR=\"$(pkgdatadir)\" -I$(srcdir)/.. -I$(top_srcdir)/lib $(X_CPPFLAGS)
AM_LDFLAGS =
-AM_CXXFLAGS = -Wall -funroll-loops
+AM_CXXFLAGS =
AM_ETAGSFLAGS = --extra=fq
rs_plasma_SOURCES = $(COMMON) plasma.cc plasma.hh
rs_plasma_LDADD = $(LIBMISC) $(X_LIBS) $(OPENGL_LIBS)
diff -Naur xbmc-9.11-8.3/xbmc/screensavers/rsxs-0.9/src/skyrocket/Makefile.in xbmc-9.11-8.4/xbmc/screensavers/rsxs-0.9/src/skyrocket/Makefile.in
--- xbmc-9.11-8.3/xbmc/screensavers/rsxs-0.9/src/skyrocket/Makefile.in 2009-01-24 23:51:01.000000000 +0100
+++ xbmc-9.11-8.4/xbmc/screensavers/rsxs-0.9/src/skyrocket/Makefile.in 2010-01-24 06:03:38.000000000 +0100
@@ -310,7 +310,7 @@
-I$(top_srcdir)/lib $(X_CPPFLAGS) $(LIBLTDL_CPPFLAGS) \
$(IMAGE_CPPFLAGS) $(SOUND_CPPFLAGS)
AM_LDFLAGS = $(IMAGE_LDFLAGS) $(SOUND_LDFLAGS)
-AM_CXXFLAGS = -Wall -funroll-loops $(IMAGE_CXXFLAGS) $(SOUND_CXXFLAGS)
+AM_CXXFLAGS = $(IMAGE_CXXFLAGS) $(SOUND_CXXFLAGS)
AM_ETAGSFLAGS = --extra=fq
rs_skyrocket_SOURCES = $(COMMON) $(COLOR) $(VECTOR) $(IMAGE) $(SOUND) $(DLOPEN) \
bee.cc bee.hh bigmama.cc bigmama.hh bomb.cc bomb.hh explosion.cc \
diff -Naur xbmc-9.11-8.3/xbmc/screensavers/rsxs-0.9/src/solarwinds/Makefile.in xbmc-9.11-8.4/xbmc/screensavers/rsxs-0.9/src/solarwinds/Makefile.in
--- xbmc-9.11-8.3/xbmc/screensavers/rsxs-0.9/src/solarwinds/Makefile.in 2009-01-24 23:51:01.000000000 +0100
+++ xbmc-9.11-8.4/xbmc/screensavers/rsxs-0.9/src/solarwinds/Makefile.in 2010-01-24 06:03:38.000000000 +0100
@@ -277,7 +277,7 @@
@DLOPEN_TRUE@LIBLTDL_CPPFLAGS = -I$(top_builddir)/libltdl
AM_CPPFLAGS = -DPKGDATADIR=\"$(pkgdatadir)\" -I$(srcdir)/.. -I$(top_srcdir)/lib $(X_CPPFLAGS)
AM_LDFLAGS =
-AM_CXXFLAGS = -Wall -funroll-loops
+AM_CXXFLAGS =
AM_ETAGSFLAGS = --extra=fq
rs_solarwinds_SOURCES = $(COMMON) $(COLOR) $(VECTOR) solarwinds.cc \
solarwinds.hh wind.cc wind.hh
xbmc-9.11-spyce.diff:
spyce.py | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
--- NEW FILE xbmc-9.11-spyce.diff ---
diff -Naur xbmc-9.11.orig/system/python/spyce/spyce.py xbmc-9.11/system/python/spyce/spyce.py
--- xbmc-9.11.orig/system/python/spyce/spyce.py 2008-12-31 05:41:27.000000000 +0100
+++ xbmc-9.11/system/python/spyce/spyce.py 2009-12-30 09:16:24.000000000 +0100
@@ -415,18 +415,18 @@
self._response = self._request = None
self._responseCallback = {}
self._moduleCallback = {}
- def _startModule(self, name, file=None, as=None, force=0):
+ def _startModule(self, name, file=None, name_as=None, force=0):
"Initialise module for current request."
- if as==None: as=name
- if force or not self._codeenv.has_key(as):
+ if name_as==None: name_as=name
+ if force or not self._codeenv.has_key(name_as):
modclass = getServer().loadModule(name, file, self._spycecode.getFilename())
mod = modclass(self._api)
- self.setModule(as, mod, 0)
+ self.setModule(name_as, mod, 0)
if DEBUG_ERROR:
- sys.stderr.write(as+'.start\n')
+ sys.stderr.write(name_as+'.start\n')
mod.start()
- self._modstarted.append((as, mod))
- else: mod = self._codeenv[as]
+ self._modstarted.append((name_as, mod))
+ else: mod = self._codeenv[name_as]
return mod
# spyce processing
def spyceInit(self, request, response):
@@ -459,10 +459,10 @@
exec '_spyce_finish()' in { '_spyce_finish': self.destroy }
# explicit modules
self._modstarted.reverse()
- for as, mod in self._modstarted:
+ for name_as, mod in self._modstarted:
try:
if DEBUG_ERROR:
- sys.stderr.write(as+'.finish\n')
+ sys.stderr.write(name_as+'.finish\n')
mod.finish(theError)
except spyceException.spyceDone: pass
except spyceException.spyceRedirect, e:
@@ -473,10 +473,10 @@
finishError = None
# default modules
self._modstarteddefault.reverse()
- for as, mod in self._modstarteddefault:
+ for name_as, mod in self._modstarteddefault:
try:
if DEBUG_ERROR:
- sys.stderr.write(as+'.finish\n')
+ sys.stderr.write(name_as+'.finish\n')
mod.finish(theError)
except: finishError = 1
self._request = None
xbmc-9.11-swscale.diff:
DllSwScale.h | 4 ++++
1 file changed, 4 insertions(+)
--- NEW FILE xbmc-9.11-swscale.diff ---
--- xbmc-9.11.orig/xbmc/cores/ffmpeg/DllSwScale.h 2009-09-15 12:19:19.000000000 +0200
+++ xbmc-9.11/xbmc/cores/ffmpeg/DllSwScale.h 2010-03-02 16:55:15.101967249 +0100
@@ -76,7 +76,11 @@
virtual int sws_scale(struct SwsContext *context, uint8_t* src[], int srcStride[], int srcSliceY,
int srcSliceH, uint8_t* dst[], int dstStride[])
+#if LIBSWSCALE_VERSION_INT >= 0x800
+ { return ::sws_scale(context, const_cast<const uint8_t**>(src), srcStride, srcSliceY, srcSliceH, dst, dstStride); }
+#else
{ return ::sws_scale(context, src, srcStride, srcSliceY, srcSliceH, dst, dstStride); }
+#endif
#if (! defined USE_EXTERNAL_FFMPEG)
virtual void sws_rgb2rgb_init(int flags) { ::sws_rgb2rgb_init(flags); }
#elif (defined HAVE_LIBSWSCALE_RGB2RGB_H) || (defined HAVE_FFMPEG_RGB2RGB_H)
xbmc-9.11-use_cdio_system_headers_on_non_win32.patch:
b/xbmc/Application.cpp | 4 ++++
b/xbmc/FileSystem/cdioSupport.cpp | 2 +-
b/xbmc/FileSystem/iso9660.cpp | 2 +-
b/xbmc/Makefile | 2 --
b/xbmc/cdrip/CDDAReader.cpp | 4 ++++
b/xbmc/cores/paplayer/AC3CDDACodec.cpp | 4 ++++
b/xbmc/cores/paplayer/CDDAcodec.cpp | 4 ++++
b/xbmc/cores/paplayer/DTSCDDACodec.cpp | 4 ++++
xbmc-9.11/xbmc/FileSystem/Makefile | 1 -
9 files changed, 22 insertions(+), 5 deletions(-)
--- NEW FILE xbmc-9.11-use_cdio_system_headers_on_non_win32.patch ---
--- xbmc-9.11/xbmc/FileSystem/Makefile.orig 2009-10-10 15:00:16.000000000 +0200
+++ xbmc-9.11/xbmc/FileSystem/Makefile 2009-12-29 14:42:11.568652874 +0100
@@ -1,5 +1,4 @@
INCLUDES=-I. -I../ -I../cores -I../linux -I../../guilib -I../lib/UnrarXLib -I../utils -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include
-INCLUDES+=-I../lib/libcdio/libcdio/include
CXXFLAGS+=-D__STDC_FORMAT_MACROS \
diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp
index 9097519..9b6418d 100644
--- a/xbmc/Application.cpp
+++ b/xbmc/Application.cpp
@@ -236,7 +236,11 @@
#endif
#ifdef HAS_DVD_DRIVE
+#ifdef _WIN32
#include "lib/libcdio/logging.h"
+#else
+#include <cdio/logging.h>
+#endif
#endif
#ifdef HAS_HAL
diff --git a/xbmc/FileSystem/cdioSupport.cpp b/xbmc/FileSystem/cdioSupport.cpp
index 00e5fdd..21a0b67 100644
--- a/xbmc/FileSystem/cdioSupport.cpp
+++ b/xbmc/FileSystem/cdioSupport.cpp
@@ -26,7 +26,7 @@
#include "cdioSupport.h"
#include "utils/SingleLock.h"
#include "utils/log.h"
-#ifndef _LINUX
+#ifdef _WIN32
#include "lib/libcdio/logging.h"
#include "lib/libcdio/util.h"
#include "lib/libcdio/mmc.h"
diff --git a/xbmc/FileSystem/iso9660.cpp b/xbmc/FileSystem/iso9660.cpp
index 6e1633f..58fbc50 100644
--- a/xbmc/FileSystem/iso9660.cpp
+++ b/xbmc/FileSystem/iso9660.cpp
@@ -44,7 +44,7 @@ ISO9660
#include "utils/CharsetConverter.h"
#include "DetectDVDType.h" // for MODE2_DATA_SIZE etc.
-#ifdef _LINUX
+#ifndef _WIN32
#include <cdio/bytesex.h>
#else
#include "lib/libcdio/bytesex.h" // for from_723 & from_733
diff --git a/xbmc/Makefile b/xbmc/Makefile
index abfbdcb..f55381a 100644
--- a/xbmc/Makefile
+++ b/xbmc/Makefile
@@ -8,8 +8,6 @@ INCLUDES+=-Ilib/libUPnP/Platinum/Source/Core \
-Ilib/libUPnP/Neptune/Source/System/Posix \
-Ilib/libUPnP/Neptune/Source/Core
-INCLUDES+=-Ilib/libcdio/libcdio/include
-
SRCS=Application.cpp \
CueDocument.cpp \
GUISettings.cpp \
diff --git a/xbmc/cdrip/CDDAReader.cpp b/xbmc/cdrip/CDDAReader.cpp
index c8b37b2..e3e9c0b 100644
--- a/xbmc/cdrip/CDDAReader.cpp
+++ b/xbmc/cdrip/CDDAReader.cpp
@@ -24,7 +24,11 @@
#ifdef HAS_CDDA_RIPPER
#include "CDDAReader.h"
+#ifdef _WIN32
#include "lib/libcdio/cdio.h"
+#else
+#include <cdio/cdio.h>
+#endif
#include "utils/log.h"
#define SECTOR_COUNT 52
diff --git a/xbmc/cores/paplayer/AC3CDDACodec.cpp b/xbmc/cores/paplayer/AC3CDDACodec.cpp
index 20cded7..f2a077a 100644
--- a/xbmc/cores/paplayer/AC3CDDACodec.cpp
+++ b/xbmc/cores/paplayer/AC3CDDACodec.cpp
@@ -22,7 +22,11 @@
#include "system.h"
#include "AC3CDDACodec.h"
#ifdef HAS_AC3_CDDA_CODEC
+#ifdef _WIN32
#include "lib/libcdio/sector.h"
+#else
+#include <cdio/sector.h>
+#endif
AC3CDDACodec::AC3CDDACodec() : AC3Codec()
{
diff --git a/xbmc/cores/paplayer/CDDAcodec.cpp b/xbmc/cores/paplayer/CDDAcodec.cpp
index ca8f1be..42460dc 100644
--- a/xbmc/cores/paplayer/CDDAcodec.cpp
+++ b/xbmc/cores/paplayer/CDDAcodec.cpp
@@ -20,7 +20,11 @@
*/
#include "CDDAcodec.h"
+#ifdef _WIN32
#include "lib/libcdio/sector.h"
+#else
+#include <cdio/sector.h>
+#endif
#define SECTOR_COUNT 55 // max. sectors that can be read at once
#define MAX_BUFFER_SIZE 2*SECTOR_COUNT*CDIO_CD_FRAMESIZE_RAW
diff --git a/xbmc/cores/paplayer/DTSCDDACodec.cpp b/xbmc/cores/paplayer/DTSCDDACodec.cpp
index e64cc2e..9bc46c6 100644
--- a/xbmc/cores/paplayer/DTSCDDACodec.cpp
+++ b/xbmc/cores/paplayer/DTSCDDACodec.cpp
@@ -22,7 +22,11 @@
#include "system.h"
#include "DTSCDDACodec.h"
#ifdef HAS_DTS_CODEC
+#ifdef _WIN32
#include "lib/libcdio/sector.h"
+#else
+#include <cdio/sector.h>
+#endif
DTSCDDACodec::DTSCDDACodec() : DTSCodec()
{
xbmc-9.11-xbmc.sh.diff:
xbmc.sh.in | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
--- NEW FILE xbmc-9.11-xbmc.sh.diff ---
--- xbmc-9.11.orig/tools/Linux/xbmc.sh.in 2009-12-06 11:44:24.000000000 +0100
+++ xbmc-9.11/tools/Linux/xbmc.sh.in 2010-01-20 17:26:39.000000000 +0100
@@ -5,7 +5,7 @@
find $1 -maxdepth $2 -name 'core*' -exec \
echo "=====> Core file: {}" 2> /dev/null >> $FILE \; -exec \
echo " ========================================= " 2> /dev/null >> $FILE \; -exec \
- gdb /usr/share/xbmc/xbmc.bin --core={} --batch -ex "thread apply all bt" 2> /dev/null >> $FILE \; -exec \
+ /usr/bin/gdb @libdir(a)/xbmc/xbmc.bin --core={} --batch -ex "thread apply all bt" 2> /dev/null >> $FILE \; -exec \
rm -f {} \;
}
@@ -37,7 +37,7 @@
if [ $XBMC_HOME ]; then
BASEDIR=$XBMC_HOME
else
- BASEDIR=@prefix@/share/xbmc/
+ BASEDIR=@libdir@/xbmc/
fi
single_stacktrace $BASEDIR 5
# find in user xbmc dir
@@ -63,11 +63,13 @@
}
# Set XBMC_HOME if xbmc.bin is a symlink
-if [ -L @prefix(a)/share/xbmc/xbmc.bin ]; then
- export XBMC_HOME="@prefix@/share/xbmc"
+if [ -L @libdir(a)/xbmc/xbmc.bin ]; then
+ export XBMC_HOME="@libdir@/xbmc"
fi
-python @prefix(a)/share/xbmc/FEH.py "$@"
+# export XBMC_HOME=@libdir@/xbmc
+
+python @libdir(a)/xbmc/FEH.py "$@"
if [ $? -ne 0 ]; then
exit
fi
@@ -76,7 +78,7 @@
while (( $LOOP ))
do
LOOP=0
- @prefix(a)/share/xbmc/xbmc.bin "$@"
+ @libdir(a)/xbmc/xbmc.bin "$@"
RET=$?
if (( $RET == 65 ))
then
xbmc-9.11-xext.diff:
configure.in | 3 +++
1 file changed, 3 insertions(+)
--- NEW FILE xbmc-9.11-xext.diff ---
--- xbmc-9.11.orig/configure.in 2010-03-02 04:27:24.000000000 +0100
+++ xbmc-9.11/configure.in 2010-03-02 17:00:29.000000000 +0100
@@ -402,6 +402,9 @@
PKG_CHECK_MODULES([XT], [xt],
[INCLUDES+=" $XT_CFLAGS"; LIBS+=" $XT_LIBS"],
AC_MSG_ERROR($missing_library))
+ PKG_CHECK_MODULES([XEXT], [xext],
+ [INCLUDES+=" $XEXT_CFLAGS"; LIBS+=" $XEXT_LIBS"],
+ AC_MSG_ERROR($missing_library))
PKG_CHECK_MODULES([XTST], [xtst],
[INCLUDES+=" $XTST_CFLAGS"; LIBS+=" $XTST_LIBS"],
AC_MSG_ERROR($missing_library))
--- NEW FILE xbmc-generate-tarball-xz.sh ---
#!/bin/sh
VERSION=${1-9.11}
tar -xzvf xbmc-$VERSION.tar.gz
cd xbmc-$VERSION
# remove bundled libraries (including zlib and OSX), saves space and forces using external versions
# also remove legally problematic libGoAhead library
for i in libass libcdio libCDRip libcurl libenca libfribidi liblzo libmms libpcre libsamplerate sqLite/sqlite libPython/Python cximage-6.0/zlib libid3tag/zlib zlib libSDL-OSX boost libportaudio libglew libGoAhead libhdhomerun
do
rm -r xbmc/lib/$i
done
# bundled win32 binaries
rm -r xbmc/visualizations/XBMCProjectM/win32
# remove various headers
rm xbmc/FileSystem/zlib.h
# remove more bundled codecs
# libfaad2, libmad needs upstream patches to be able to remove from tarball
# even though the bundled libaries aren't, I think, compiled
for i in ffmpeg liba52 libmpeg2 libdts
do
rm -r xbmc/cores/dvdplayer/Codecs/$i
done
# remove DVD stuff we can't ship, or is already in external libraries
for i in libdvdcss libdvdread includes
do
rm -r xbmc/cores/dvdplayer/Codecs/libdvd/$i
done
# remove all prebuilt binaries (e.g., .so files and Win32 DLLs)
find \( -name '*.so' -o -name '*.DLL' -o -name '*.dll' -o -name '*.lib' -o -name '*.zlib' -o -name '*.obj' -o -name '*.exe' -o -name '*.vis' \) | xargs rm -f
# remove other packages that should be system-wide
rm -rf lib
cd -
# repack
tar -cJvf xbmc-$VERSION-patched.tar.xz xbmc-$VERSION
--- NEW FILE xbmc.spec ---
Name: xbmc
Version: 9.11
Release: 16%{?dist}
URL: http://www.xbmc.org/
Source0: %{name}-%{version}-patched.tar.xz
# xbmc contains code that we cannot ship, as well as redundant private
# copies of upstream libraries that we already distribute. Therefore
# we use this script to remove the code before shipping it.
# Download the upstream tarball from:
# http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
# and invoke this script while in the directory where the tarball is located:
# ./xbmc-generate-tarball-xz.sh <version>
# where <version> is the particular version being used
Source1: xbmc-generate-tarball-xz.sh
# look for libdca, rather than libdts
# http://xbmc.org/trac/ticket/8040
Patch1: xbmc-9.11-libdca.patch
# Needs work before being submitted upstream
Patch2: xbmc-9.11-b1-dvdlibs-external.patch
# http://xbmc.org/trac/ticket/8026 (this will be in next release)
Patch3: xbmc-9.11-use_cdio_system_headers_on_non_win32.patch
# Next 3 patches to use %{_libdir}
# http://xbmc.org/trac/ticket/8590
Patch4: xbmc-9.11-fix-Makefile.in.patch
Patch5: xbmc-9.11-Makefile.include.in.diff
Patch6: xbmc-9.11-xbmc.sh.diff
# Next 2 patches submitted upstream
# http://www.xbmc.org/trac/ticket/8629
Patch7: xbmc-9.11-spyce.diff
Patch8: xbmc-9.11-RandomNumberGenerators.hpp.diff
# Needs work before being submitted upstream
Patch9: xbmc-9.11-remlibass.patch
# Fixes GCC warning: partial backport to 9.11
# (should be fixed in next release)
Patch10: xbmc-9.11-changeset-26191.diff
# remove goahead completely from compilation, it's been replaced
# by libmicrohttpd in SVN, so should add that BuildRequires for 10.5
# and drop this patch
Patch11: xbmc-9.11-remove-goahead.patch
# Next 12 patches submitted upstream:
# http://www.xbmc.org/trac/ticket/8629
Patch12: xbmc-9.11-external-zlib.diff
Patch13: xbmc-9.11-goom-missing.diff
Patch14: xbmc-9.11-rsxs-0.9.diff
Patch15: xbmc-9.11-Weather.diff
Patch16: xbmc-9.11-XBMCProjectM-cmake.diff
Patch17: xbmc-9.11-cflags.patch
Patch18: xbmc-9.11-configure.patch
Patch19: xbmc-9.11-gymcodec.patch
Patch20: xbmc-9.11-macdll.patch
Patch21: xbmc-9.11-maclib.patch
Patch22: xbmc-9.11-libid3tag.patch
Patch23: xbmc-9.11-librtv.patch
# these next 2 are (hopefully temporary) hacks
Patch24: xbmc-9.11-swscale.diff
Patch25: xbmc-9.11-xext.diff
# an attempt to force hdhomerun to be external
Patch26: xbmc-9.11-hdhomerun.patch
Buildroot: %{_tmppath}/%{name}-%{version}
Summary: Media center
License: GPLv2+
Group: Applications/Multimedia
BuildRequires: desktop-file-utils
BuildRequires: SDL-devel
BuildRequires: SDL_image-devel
BuildRequires: SDL_mixer-devel
BuildRequires: fontconfig-devel
BuildRequires: fribidi-devel
BuildRequires: glibc-devel
BuildRequires: hal-devel
BuildRequires: glew-devel
BuildRequires: libstdc++-devel
BuildRequires: glib2-devel
BuildRequires: libjasper-devel
BuildRequires: libjpeg-devel
BuildRequires: libogg-devel
BuildRequires: libpng-devel
BuildRequires: libstdc++-devel
BuildRequires: e2fsprogs-devel
BuildRequires: libvorbis-devel
BuildRequires: lzo-devel
BuildRequires: pcre-devel
BuildRequires: zlib-devel
BuildRequires: tre-devel
BuildRequires: boost-devel
BuildRequires: bzip2-devel
BuildRequires: freetype-devel
BuildRequires: libXinerama-devel
BuildRequires: fontconfig-devel
BuildRequires: mysql-devel
BuildRequires: jasper-devel
BuildRequires: enca-devel
BuildRequires: cmake
BuildRequires: gperf
BuildRequires: nasm
BuildRequires: libXmu-devel
BuildRequires: pcre-devel
BuildRequires: gcc-c++
BuildRequires: sqlite-devel
BuildRequires: curl-devel
BuildRequires: libcdio-devel
BuildRequires: flex
BuildRequires: libmad-devel
BuildRequires: libsamplerate-devel
BuildRequires: libsmbclient-devel
BuildRequires: libmms-devel
BuildRequires: libXtst-devel
BuildRequires: libvdpau-devel
BuildRequires: desktop-file-utils
BuildRequires: python-devel
BuildRequires: wavpack-devel
BuildRequires: a52dec-devel
BuildRequires: libmpeg2-devel
BuildRequires: libmpcdec-devel
BuildRequires: flac-devel
BuildRequires: avahi-devel
BuildRequires: libtool
BuildRequires: libtiff-devel
BuildRequires: libvdpau-devel
BuildRequires: libdvdread-devel
BuildRequires: ffmpeg-devel
BuildRequires: faad2-devel
BuildRequires: pulseaudio-libs-devel
BuildRequires: libdca-devel
BuildRequires: libass-devel >= 0.9.7
BuildRequires: hdhomerun-devel
# add following BR in next release of XBMC to get support for crystalhd devices
#BuildRequires: libcrystalhd-devel
%description
XBMC media center is a free cross-platform media-player jukebox and
entertainment hub. XBMC can play a spectrum of of multimedia formats,
and featuring playlist, audio visualizations, slideshow, and weather
forecast functions, together third-party plugins.
%prep
%setup -q -n %{name}-%{version}
%patch1 -p1 -b .dtsdca
%patch2 -p1 -b .dvdlibs
%patch3 -p1 -b .cdio
%patch4 -p0 -b .makefilein
%patch5 -p1 -b .makefileincl
%patch6 -p1 -b .xbmcsh
%patch7 -p1
%patch8 -p1 -b .rand
%patch9 -p1 -b .remlibass
%patch10 -p1 -b .gccwarning
%patch11 -p0 -b .removegoahead
%patch12 -p1 -b .zlib
%patch13 -p1 -b .goom
%patch14 -p1 -b .rsxs
%patch15 -p1 -b .weather
%patch16 -p1 -b .projectm
%patch17 -p1 -b .cflags
%patch18 -p1
%patch19 -p1
%patch20 -p1
%patch21 -p1
%patch22 -p1
%patch23 -p1
%patch24 -p1
%patch25 -p1
%patch26 -p1 -b .hdhomerun
# Prevent rerunning the autotools.
touch -r xbmc/screensavers/rsxs-0.9/aclocal.m4 \
$(find xbmc/screensavers/rsxs-0.9 \( -name 'configure.*' -o -name 'Makefile.*' \))
%build
chmod +x bootstrap
./bootstrap
# Can't use export nor %%configure (implies using export), because
# the Makefile pile up *FLAGS in this case.
./configure \
--prefix=%{_prefix} --bindir=%{_bindir} --includedir=%{_includedir} \
--libdir=%{_libdir} --datadir=%{_datadir} \
--enable-external-libraries --enable-goom \
--disable-optimizations --disable-debug \
--disable-webserver \
SVN_REV=26017 \
CPPFLAGS="-I/usr/include/ffmpeg" \
CFLAGS="$RPM_OPT_FLAGS -fPIC -I/usr/include/ffmpeg" \
CXXFLAGS="$RPM_OPT_FLAGS -fPIC -I/usr/include/ffmpeg" \
LDFLAGS="-fPIC" \
LIBS="-L%{_libdir}/mysql -lhdhomerun $LIBS" \
ASFLAGS=-fPIC
make %{?_smp_mflags} VERBOSE=1
%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install
# remove the doc files from libdir, they should be put in the docdir
rm $RPM_BUILD_ROOT/%{_libdir}/xbmc/copying.txt $RPM_BUILD_ROOT/%{_libdir}/xbmc/keymapping.txt $RPM_BUILD_ROOT/%{_libdir}/xbmc/LICENSE.GPL $RPM_BUILD_ROOT/%{_libdir}/xbmc/README.linux
# remove bogus header file
rm -f $RPM_BUILD_ROOT%{_libdir}/xbmc/visualisations/xbmc_vis.h
# make Python files executable to keep rpmlint quiet
# (spyce to be dropped from next xbmc release, so this can be dropped then)
for i in run_spyceCGI.py run_spyceCmd.py run_spyceModpy.py spyceCGI.py spyceCmd.py spyce.py verchk.py
do
chmod +x $RPM_BUILD_ROOT%{_libdir}/xbmc/system/python/spyce/$i
done
desktop-file-install \
--dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
$RPM_BUILD_ROOT%{_datadir}/applications/xbmc.desktop
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root)
%doc copying.txt keymapping.txt LICENSE.GPL README.linux
%{_bindir}/xbmc
%{_bindir}/xbmc-standalone
%{_libdir}/xbmc
%{_datadir}/xsessions/XBMC.desktop
%{_datadir}/applications/xbmc.desktop
%{_datadir}/pixmaps/xbmc.png
%changelog
* Wed Mar 24 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 9.11-16
- Add BuildRequires: hdhomerun-devel
* Sun Mar 7 2010 Rolf Fokkens <rolf fokkens[AT]wanadoo nl> - 9.11-15
- Add patch for force using hdhomerun external, had to create a
hdhomerun-devel package first
* Sat Mar 6 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 9.11-14
- Add patch that removes all webserver GoAhead functionality due to
problematic license
- Drop BR: faac-devel since it was moved to nonfree
* Fri Mar 5 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 9.11-13
- Patches to add -lXext to LIBS (thanks Ralf Corsepius)
- Hack to work around ffmpeg sws_scale() incompatibility (thanks Ralf)
- Remove bundled boost, libportaudio, libglew and extra unused zlib
header from tarball
- Call desktop-file-install as per review guidelines
- Make spyce files executable, quiets rpmlint
* Mon Feb 8 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 9.11-12
- More patches from Ralf Corsepius
- Update configure line, specify *FLAGS directly in configure line
(thanks Ralf)
- Touch rsxs Makefiles to prevent rerunning the autotools (thanks Ralf)
- Add missing %%clean (thanks Ralf)
- Remove even more unused library copies in generate tarball script
* Tue Jan 26 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 9.11-11
- Add another patch to ensure Makefile's pass compiler flags properly
(thanks Ralf C)
- Remove commands no longer needed in install
* Mon Jan 25 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 9.11-10
- Patches for RPM_OPT_FLAGS being recognised throughout (thanks
Ralf C)
- Patch for goom (Ralf C)
- Patch for using external zlib (Ralf C)
- Pass CPPFLAGS to configure (Ralf C)
* Thu Jan 21 2010 Rolf Fokkens <rolf fokkens[AT]wanadoo nl> - 9.11-9
- increase compression ratio of tarball by compressing with cx
the src.rpm is now about 20% smaller
- remove patch0 and patch1, they are obsolete now
- rename patch2 and patch10 to more meaningful name
* Thu Jan 21 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 9.11-8
- Update xbmc script patch (thanks Ralf C)
- Reorder patches, add upstream tickets where possible
- Drop SVN_REV from line until exact version clarified
* Mon Jan 18 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 9.11-7
- Remove bundled copies of libraries, and code that we can't
distribute from upstream tarball with script
- Drop patch against ffmpeg which we removed from tarball
- Trim description
* Sun Jan 17 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 9.11-6
- Add patch for web server segfaults on 64-bit (thanks Ralf Corsepius)
- Drop patch backup for .spyce, causes packaging problems (thanks Ralf
Corsepius)
- Remove bogus header from install (thanks Ralf Corsepius)
- More comprehensive pre-built Win32 binary removal (thanks Ralf
Corsepius)
- Add SVN_REV to configure line for plugins (thanks Graeme Gillies)
* Tue Jan 5 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 9.11-5
- Remove unnecessary BR: mysql-libs
- Prune out unneeded stuff from build (thanks Rolf Fokkens)
- Remove libraries not compiled (thanks Rolf Fokkens)
- Patch to some nasty GCC warnings (thanks Ralf Corsepius)
* Thu Dec 31 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 9.11-4
- Patches to fix installation paths to /usr/lib/ (thanks Ralf Corsepius)
- Patch to fix other issues: random number library (thanks Ralf Corsepius)
* Wed Dec 30 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 9.11-3
- Cleanup spec for submission to RPM Fusion
- Fix changelog entries to use standard numbering to quiet rpmlint
- Use standard URL for sourceforge tarballs
- Add BR: pulseaudio-libs-devel and others
- Add patch that removes comments in rules in Makefile.in that
prevented install target working
* Tue Dec 29 2009 Rolf Fokkens <rolf fokkens wanadoo nl> - 9.11-2
- use external libcdio again, patch by MaestroDD
* Fri Dec 25 2009 Rolf Fokkens <rolf fokkens wanadoo nl> - 9.11-1
- Update to 9.11
* Fri Dec 18 2009 Rolf Fokkens <rolf fokkens wanadoo nl> - 9.11-0.5.rc1
- Update to 9.11 rc1
* Fri Dec 11 2009 Rolf Fokkens <rolf fokkens wanadoo nl> - 9.11-0.4.beta2
- Update to 9.11 beta2
* Tue Dec 1 2009 Rolf Fokkens <rolf fokkens wanadoo nl> - 9.11-0.3.beta1
- Force using external libdvdread and libdvdcss. libdvdnav is stil internal
as xbmc needs its internals.
* Sat Nov 28 2009 Rolf Fokkens <rolf fokkens wanadoo nl> - 9.11-0.2.beta1
- replaced dependency on libdts by libdca
- removed dependency on external libcdio, use included one instead
now detection of CD's and DVD's works again
- Compiles and runs on Fedora 11
- Update to 9.11 beta1
* Sun Nov 15 2009 Rolf Fokkens <rolf fokkens wanadoo nl> - 9.11-0.1.alpha2
- Compiles and runs on Fedora 11
- Update to 9.11 alpha2
* Fri May 15 2009 Scott Harvanek <scotth(a)login.com> - 9.04-1
- Update to 9.04
* Wed Jan 28 2009 Scott Harvanek <scotth(a)login.com> - 8.10-3
- Added requires for
- alsa-plugins-pulseaudio, libogg, libmad, libvorbis
* Fri Jan 2 2009 Scott Harvanek <scotth(a)login.com> - 8.10-2
- Patch for English language strings.xml
* Thu Nov 27 2008 Scott Harvanek <scotth(a)login.com> - 8.10-1
- v8.10
- Fedora 10 RPM
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/xbmc/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 26 Mar 2010 20:02:23 -0000 1.1
+++ .cvsignore 26 Mar 2010 23:39:00 -0000 1.2
@@ -0,0 +1 @@
+xbmc-9.11-patched.tar.xz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/xbmc/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 26 Mar 2010 20:02:23 -0000 1.1
+++ sources 26 Mar 2010 23:39:00 -0000 1.2
@@ -0,0 +1 @@
+c8c54a8839b289a97140f7f41acfedc4 xbmc-9.11-patched.tar.xz
14 years, 1 month
- 1
- 0
rpms/xbmc/F-12 xbmc.spec,1.1,1.2
by Alex Lancaster
Author: alexlan
Update of /cvs/free/rpms/xbmc/F-12
In directory se02.es.rpmfusion.net:/tmp/cvs-serv32158
Modified Files:
xbmc.spec
Log Message:
- Fixed license tag to include GPLv3+
Index: xbmc.spec
===================================================================
RCS file: /cvs/free/rpms/xbmc/F-12/xbmc.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xbmc.spec 26 Mar 2010 21:40:19 -0000 1.1
+++ xbmc.spec 26 Mar 2010 21:50:17 -0000 1.2
@@ -1,6 +1,6 @@
Name: xbmc
Version: 9.11
-Release: 16%{?dist}
+Release: 17%{?dist}
URL: http://www.xbmc.org/
Source0: %{name}-%{version}-patched.tar.xz
@@ -71,7 +71,7 @@
Buildroot: %{_tmppath}/%{name}-%{version}
Summary: Media center
-License: GPLv2+
+License: GPLv2+ and GPLv3+
Group: Applications/Multimedia
BuildRequires: desktop-file-utils
BuildRequires: SDL-devel
@@ -236,6 +236,9 @@
%{_datadir}/pixmaps/xbmc.png
%changelog
+* Fri Mar 26 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 9.11-17
+- Fixed license tag to include GPLv3+
+
* Wed Mar 24 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 9.11-16
- Add BuildRequires: hdhomerun-devel
14 years, 1 month
- 1
- 0
rpms/xbmc/F-12 xbmc-9.11-Makefile.include.in.diff, NONE, 1.1 xbmc-9.11-RandomNumberGenerators.hpp.diff, NONE, 1.1 xbmc-9.11-Weather.diff, NONE, 1.1 xbmc-9.11-XBMCProjectM-cmake.diff, NONE, 1.1 xbmc-9.11-b1-dvdlibs-external.patch, NONE, 1.1 xbmc-9.11-cflags.patch, NONE, 1.1 xbmc-9.11-changeset-26191.diff, NONE, 1.1 xbmc-9.11-configure.patch, NONE, 1.1 xbmc-9.11-external-zlib.diff, NONE, 1.1 xbmc-9.11-fix-Makefile.in.patch, NONE, 1.1 xbmc-9.11-goom-missing.diff, NONE, 1.1 xbmc-9.11-gymcodec.patch, NONE, 1.1 x
by Alex Lancaster
Author: alexlan
Update of /cvs/free/rpms/xbmc/F-12
In directory se02.es.rpmfusion.net:/tmp/cvs-serv30419/F-12
Modified Files:
.cvsignore sources
Added Files:
xbmc-9.11-Makefile.include.in.diff
xbmc-9.11-RandomNumberGenerators.hpp.diff
xbmc-9.11-Weather.diff xbmc-9.11-XBMCProjectM-cmake.diff
xbmc-9.11-b1-dvdlibs-external.patch xbmc-9.11-cflags.patch
xbmc-9.11-changeset-26191.diff xbmc-9.11-configure.patch
xbmc-9.11-external-zlib.diff xbmc-9.11-fix-Makefile.in.patch
xbmc-9.11-goom-missing.diff xbmc-9.11-gymcodec.patch
xbmc-9.11-hdhomerun.patch xbmc-9.11-libdca.patch
xbmc-9.11-libid3tag.patch xbmc-9.11-librtv.patch
xbmc-9.11-macdll.patch xbmc-9.11-maclib.patch
xbmc-9.11-remlibass.patch xbmc-9.11-remove-goahead.patch
xbmc-9.11-rsxs-0.9.diff xbmc-9.11-spyce.diff
xbmc-9.11-swscale.diff
xbmc-9.11-use_cdio_system_headers_on_non_win32.patch
xbmc-9.11-xbmc.sh.diff xbmc-9.11-xext.diff
xbmc-generate-tarball-xz.sh xbmc.spec
Log Message:
Initial import.
xbmc-9.11-Makefile.include.in.diff:
Makefile.include.in | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
--- NEW FILE xbmc-9.11-Makefile.include.in.diff ---
diff -Naur xbmc-9.11.orig/Makefile.include.in xbmc-9.11/Makefile.include.in
--- xbmc-9.11.orig/Makefile.include.in 2009-11-14 04:53:41.000000000 +0100
+++ xbmc-9.11/Makefile.include.in 2009-12-30 08:39:41.000000000 +0100
@@ -5,6 +5,8 @@
ARCH=@ARCH@
abs_top_srcdir=@abs_top_srcdir@
prefix=@prefix@
+bindir=@bindir@
+libdir=@libdir@
CXX=@CXX@
CC=@CC@
CXXFLAGS+=@CXXFLAGS@
@@ -18,7 +20,7 @@
-D_REENTRANT \
-D_LARGEFILE64_SOURCE \
-D_FILE_OFFSET_BITS=64 \
- -DINSTALL_PATH="\"@prefix@/share/xbmc\"" \
+ -DINSTALL_PATH="\"@libdir@/xbmc\"" \
@SDL_DEFINES@ \
@ARCH_DEFINES@ \
@DEFS@ \
xbmc-9.11-RandomNumberGenerators.hpp.diff:
RandomNumberGenerators.hpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE xbmc-9.11-RandomNumberGenerators.hpp.diff ---
diff -Naur xbmc-9.11.orig/xbmc/visualizations/XBMCProjectM/libprojectM/RandomNumberGenerators.hpp xbmc-9.11/xbmc/visualizations/XBMCProjectM/libprojectM/RandomNumberGenerators.hpp
--- xbmc-9.11.orig/xbmc/visualizations/XBMCProjectM/libprojectM/RandomNumberGenerators.hpp 2008-07-18 06:54:03.000000000 +0200
+++ xbmc-9.11/xbmc/visualizations/XBMCProjectM/libprojectM/RandomNumberGenerators.hpp 2009-12-31 11:57:53.000000000 +0100
@@ -85,7 +85,7 @@
// Sum up mass, stopping when cutoff is reached. This is the typical
// weighted sampling algorithm.
float mass = 0;
- for (std::size_t i = 0; i< weights.size() ; i) {
+ for (std::size_t i = 0; i< weights.size() ; i++) {
mass += weights[i];
if (mass >= cutoff)
return i;
xbmc-9.11-Weather.diff:
Weather.cpp | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
--- NEW FILE xbmc-9.11-Weather.diff ---
diff -Naur xbmc-9.11-8.2/xbmc/utils/Weather.cpp xbmc-9.11-8.3/xbmc/utils/Weather.cpp
--- xbmc-9.11-8.2/xbmc/utils/Weather.cpp 2009-11-12 08:41:55.000000000 +0100
+++ xbmc-9.11-8.3/xbmc/utils/Weather.cpp 2010-01-22 10:56:40.000000000 +0100
@@ -399,7 +399,7 @@
GetString(pOneDayElement, "low", iTmpStr, "");
if (iTmpStr == "N/A")
- m_info.forecast[i].m_high = "";
+ m_info.forecast[i].m_low = "";
else
{
CTemperature temp=CTemperature::CreateFromCelsius(atoi(iTmpStr));
@@ -417,8 +417,12 @@
m_info.forecast[i].m_icon.Format("%s128x128/na.png", WEATHER_BASE_PATH);
else
m_info.forecast[i].m_icon.Format("%s128x128/%s.png", WEATHER_BASE_PATH, iTmpStr);
-
- GetString(pDayTimeElement, "t", m_info.forecast[i].m_overview, "");
+
+ GetString(pDayTimeElement, "t", iTmpStr, ""); //string cause i've seen it return N/A
+ if (iTmpStr == "N/A")
+ m_info.forecast[i].m_overview = "";
+ else
+ m_info.forecast[i].m_overview = iTmpStr;
LocalizeOverview(m_info.forecast[i].m_overview);
}
xbmc-9.11-XBMCProjectM-cmake.diff:
configure.in | 8 +++++++-
xbmc/visualizations/XBMCProjectM/libprojectM/CMakeLists.txt | 2 +-
2 files changed, 8 insertions(+), 2 deletions(-)
--- NEW FILE xbmc-9.11-XBMCProjectM-cmake.diff ---
diff -Naur xbmc-9.11-8.4/configure.in xbmc-9.11-8.5/configure.in
--- xbmc-9.11-8.4/configure.in 2010-01-24 06:05:15.000000000 +0100
+++ xbmc-9.11-8.5/configure.in 2010-01-24 06:41:46.000000000 +0100
@@ -1329,7 +1329,13 @@
if test "$host_vendor" = "apple" ; then
rm -f CMakeCache.txt && CC="" CXX="" cmake -D CMAKE_C_FLAGS:STRING="-fno-common" -D CMAKE_CXX_FLAGS:STRING="-fno-common" -D CMAKE_BUILD_TYPE:STRING=RelWithDebInfo -D USE_FTGL:BOOL=OFF .
else
- rm -f CMakeCache.txt && CC="" CXX="" cmake -D CMAKE_BUILD_TYPE:STRING=RelWithDebInfo -D USE_FTGL:BOOL=OFF .
+set -x
+ rm -f CMakeCache.txt && cmake -DCMAKE_BUILD_TYPE=None -DUSE_FTGL:BOOL=OFF \
+ -DCMAKE_C_FLAGS="${CFLAGS}" -DCMAKE_CXX_FLAGS="${CXXFLAGS}" \
+ -DCMAKE_INSTALL_PREFIX="${prefix}" -DCMAKE_INSTALL_LIBDIR:PATH="${libdir}" \
+ -DINCLUDE_INSTALL_DIR:PATH="${includedir}" -DLIB_INSTALL_DIR:PATH="${_libdir}" \
+ -DSYSCONF_INSTALL_DIR:PATH="${sysconfdir}" -DSHARE_INSTALL_PREFIX:PATH="${datadir}" .
+set +x
fi
], [0])
diff -Naur xbmc-9.11-8.4/xbmc/visualizations/XBMCProjectM/libprojectM/CMakeLists.txt xbmc-9.11-8.5/xbmc/visualizations/XBMCProjectM/libprojectM/CMakeLists.txt
--- xbmc-9.11-8.4/xbmc/visualizations/XBMCProjectM/libprojectM/CMakeLists.txt 2009-12-08 04:05:05.000000000 +0100
+++ xbmc-9.11-8.5/xbmc/visualizations/XBMCProjectM/libprojectM/CMakeLists.txt 2010-01-24 06:41:46.000000000 +0100
@@ -116,7 +116,7 @@
ENDIF(FTGL_FOUND)
# todo: change this because its obscure and probably not being used
- set (FTGL_INCLUDE_DIRS "/opt/local/include")
+# set (FTGL_INCLUDE_DIRS "/opt/local/include")
set (FTGL_LINK_DIRS)
set (FTGL_LINK_TARGETS )
ENDIF(USE_FTGL)
xbmc-9.11-b1-dvdlibs-external.patch:
configure.in | 64 -------------------------
xbmc/cores/dvdplayer/Codecs/libdvd/Makefile.in | 9 +--
2 files changed, 5 insertions(+), 68 deletions(-)
--- NEW FILE xbmc-9.11-b1-dvdlibs-external.patch ---
--- xbmc-9.11-b1/configure.in.dvdlibs 2009-12-01 23:00:27.689755837 +0100
+++ xbmc-9.11-b1/configure.in 2009-12-01 23:13:34.449759740 +0100
@@ -37,8 +37,6 @@
pulse_disabled="== PulseAudio support manually disabled. =="
faac_not_found="== Could not find libfaac. FAAC support disabled. =="
faac_disabled="== FAAC support manually disabled. =="
-dvdcss_enabled="== DVDCSS support enabled. =="
-dvdcss_disabled="== DVDCSS support disabled. =="
avahi_not_found="== Could not find libavahi-common or libavahi-client. Avahi support disabled. =="
avahi_disabled="== Avahi support disabled. =="
vdpau_not_found="== Could not find libvdpau. VDPAU support disabled. =="
@@ -160,12 +158,6 @@
[use_faac=$enableval],
[use_faac=yes])
-AC_ARG_ENABLE([dvdcss],
- [AS_HELP_STRING([--enable-dvdcss],
- [enable DVDCSS support (default is yes)])],
- [use_dvdcss=$enableval],
- [use_dvdcss=yes])
-
AC_ARG_ENABLE([mid],
[AS_HELP_STRING([--enable-mid],
[enable MID support (default is no)])],
@@ -871,20 +863,6 @@
final_message="$final_message\n FAAC:\t\tNo"
fi
-# DVDCSS
-if test "$use_dvdcss" = "yes"; then
- AC_MSG_NOTICE($dvdcss_enabled)
- final_message="$final_message\n DVDCSS:\tYes"
- BUILD_DVDCSS=1
- SKIP_CONFIG_DVDCSS=0
- DVDREAD_CFLAGS="-D_XBMC -DHAVE_DVDCSS_DVDCSS_H"
-else
- AC_MSG_NOTICE($dvdcss_disabled)
- final_message="$final_message\n DVDCSS:\tNo"
- BUILD_DVDCSS=0
- SKIP_CONFIG_DVDCSS=1
- DVDREAD_CFLAGS="-D_XBMC -UHAVE_DVDCSS_DVDCSS_H"
-fi
if test "$use_avahi" = "yes"; then
final_message="$final_message\n Avahi:\tYes"
else
@@ -1214,44 +1192,6 @@
fi
], [$USE_EXTERNAL_LIBDTS])
-XB_CONFIG_MODULE([xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss], [
- if test "$host_vendor" = "apple" ; then
- ./configure MACOSX_DEPLOYMENT_TARGET=10.4 \
- CFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" \
- --disable-doc \
- --enable-static \
- --with-pic
- else
- ./configure \
- --disable-doc \
- --enable-static \
- --with-pic
- fi
-], [$SKIP_CONFIG_DVDCSS])
-
-XB_CONFIG_MODULE([xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread], [
- if test "$host_vendor" = "apple" ; then
- ./configure2 MACOSX_DEPLOYMENT_TARGET=10.4 \
- --extra-cflags="$DVDREAD_CFLAGS -D__DARWIN__ -fPIC -DPIC -fno-common -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4 -I`pwd`/../libdvdcss/src" \
- --enable-static \
- --disable-shared \
- --cc="$CC" &&
- make dvdread-config &&
- mkdir -p `pwd`/../includes/dvdread
- cp `pwd`/../libdvdread/src/*.h `pwd`/../includes/dvdread
- else
- ./configure2 \
- --extra-cflags="$DVDREAD_CFLAGS -fPIC -DPIC -I`pwd`/../libdvdcss/src" \
- --enable-static \
- --disable-shared \
- --cc="$CC" &&
- make dvdread-config &&
- mkdir -p `pwd`/../includes/dvdread
- cp `pwd`/../libdvdread/src/*.h `pwd`/../includes/dvdread
- fi
-
-], [0])
-
XB_CONFIG_MODULE([xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav], [
if test "$host_vendor" = "apple" ; then
./configure2 MACOSX_DEPLOYMENT_TARGET=10.4 \
@@ -1263,9 +1203,7 @@
--cc="$CC"
else
./configure2 \
- --extra-cflags="$DVDREAD_CFLAGS -fPIC -DPIC -I`pwd`/../includes" \
- --extra-ldflags="-L`pwd`/../libdvdread/obj" \
- --with-dvdread-config="`pwd`/../libdvdread/obj/dvdread-config" \
+ --extra-cflags="-D_XBMC -fPIC -DPIC" \
--enable-static \
--disable-shared \
--cc="$CC"
--- xbmc-9.11-b1/xbmc/cores/dvdplayer/Codecs/libdvd/Makefile.in.dvdlibs 2009-07-10 01:10:10.000000000 +0200
+++ xbmc-9.11-b1/xbmc/cores/dvdplayer/Codecs/libdvd/Makefile.in 2009-12-02 23:15:36.942762083 +0100
@@ -2,13 +2,12 @@
ARCH=@ARCH@
SYSDIR=../../../../../system/players/dvdplayer
SOS= libdvdnav-$(ARCH).so
-DIRS= libdvdread \
- libdvdnav
+DIRS= libdvdnav
WRAPPER=../../../DllLoader/exports/wrapper.o
WRAPPER_OSX=../../../../../tools/Mach5/wrapper.rb
-LDFLAGS=-shared -fPIC -rdynamic
+LDFLAGS=-shared -fPIC -rdynamic -ldvdread
ifeq ($(ARCH), powerpc-osx)
# Add -lbundle1.o for powerpc-osx
BUNDLE1_O = -lbundle1.o
@@ -53,8 +52,8 @@
libdvdcss/src/*.o \
`cat $(WRAPPER:.o=.def)` $(WRAPPER)
-$(SYSDIR)/libdvdnav-$(ARCH).so: $(WRAPPER) $(DVDCSS_A) libdvdread/obj/libdvdread.a libdvdnav/obj/libdvdnav.a
- $(CC) -o $@ $(LDFLAGS) --soname,$@ $(DVDCSS_O) libdvdread/obj/*.o libdvdnav/obj/*.o \
+$(SYSDIR)/libdvdnav-$(ARCH).so: $(WRAPPER) $(DVDCSS_A) libdvdnav/obj/libdvdnav.a
+ $(CC) -o $@ $(LDFLAGS) --soname,$@ $(DVDCSS_O) libdvdnav/obj/*.o \
`cat $(WRAPPER:.o=.def)` $(WRAPPER)
endif
xbmc-9.11-cflags.patch:
tools/TexturePacker/Makefile.in | 2 +-
xbmc/cores/dvdplayer/Codecs/libdvd/Makefile.in | 4 ++--
xbmc/cores/paplayer/AC3Codec/Makefile.in | 4 ++--
xbmc/cores/paplayer/ADPCMCodec/Makefile.in | 6 +++---
xbmc/cores/paplayer/FLACCodec/Makefile.in | 4 ++--
xbmc/cores/paplayer/GYMCodec/Makefile.in | 2 +-
xbmc/cores/paplayer/MACDll/Makefile.in | 2 +-
xbmc/cores/paplayer/ModuleCodec/Makefile.in | 2 +-
xbmc/cores/paplayer/NSFCodec/Makefile.in | 2 +-
xbmc/cores/paplayer/SIDCodec/Makefile.in | 2 +-
xbmc/cores/paplayer/SPCCodec/SNES/SNESAPU/Makefile.in | 6 +++---
xbmc/cores/paplayer/WavPackCodec/Makefile.in | 2 +-
xbmc/cores/paplayer/YMCodec/StSoundLibrary/Makefile.in | 2 +-
xbmc/cores/paplayer/timidity/Makefile.in | 4 ++--
xbmc/cores/paplayer/vgmstream/Makefile.in | 4 ++--
xbmc/cores/paplayer/vorbisfile/Makefile.in | 2 +-
xbmc/lib/libid3tag/Makefile.in | 2 +-
xbmc/visualizations/Goom/Makefile.in | 2 +-
xbmc/visualizations/XBMCProjectM/Makefile.in | 4 ++--
19 files changed, 29 insertions(+), 29 deletions(-)
--- NEW FILE xbmc-9.11-cflags.patch ---
diff -Naur xbmc-9.11-10.0/tools/TexturePacker/Makefile.in xbmc-9.11-10.1/tools/TexturePacker/Makefile.in
--- xbmc-9.11-10.0/tools/TexturePacker/Makefile.in 2009-10-04 05:55:21.000000000 +0200
+++ xbmc-9.11-10.1/tools/TexturePacker/Makefile.in 2010-01-26 05:14:09.000000000 +0100
@@ -21,4 +21,4 @@
include ../../Makefile.include
$(TARGET): $(OBJS)
- $(CXX) $(OBJS) $(LDFLAGS) $(LIBS) -o $(TARGET)
+ $(CXX) $(CXXFLAGS) $(OBJS) $(LDFLAGS) $(LIBS) -o $(TARGET)
diff -Naur xbmc-9.11-10.0/xbmc/cores/dvdplayer/Codecs/libdvd/Makefile.in xbmc-9.11-10.1/xbmc/cores/dvdplayer/Codecs/libdvd/Makefile.in
--- xbmc-9.11-10.0/xbmc/cores/dvdplayer/Codecs/libdvd/Makefile.in 2010-01-25 14:29:23.000000000 +0100
+++ xbmc-9.11-10.1/xbmc/cores/dvdplayer/Codecs/libdvd/Makefile.in 2010-01-26 05:14:09.000000000 +0100
@@ -48,12 +48,12 @@
else
$(SYSDIR)/libdvdcss-$(ARCH).so: $(WRAPPER) libdvdcss/src/.libs/libdvdcss.a
- $(CC) -o $@ $(LDFLAGS) --soname,$@ \
+ $(CC) $(CFLAGS) -o $@ $(LDFLAGS) --soname,$@ \
libdvdcss/src/*.o \
`cat $(WRAPPER:.o=.def)` $(WRAPPER)
$(SYSDIR)/libdvdnav-$(ARCH).so: $(WRAPPER) $(DVDCSS_A) libdvdnav/obj/libdvdnav.a
- $(CC) -o $@ $(LDFLAGS) --soname,$@ $(DVDCSS_O) libdvdnav/obj/*.o \
+ $(CC) $(CFLAGS) -o $@ $(LDFLAGS) --soname,$@ $(DVDCSS_O) libdvdnav/obj/*.o \
`cat $(WRAPPER:.o=.def)` $(WRAPPER)
endif
diff -Naur xbmc-9.11-10.0/xbmc/cores/paplayer/AC3Codec/Makefile.in xbmc-9.11-10.1/xbmc/cores/paplayer/AC3Codec/Makefile.in
--- xbmc-9.11-10.0/xbmc/cores/paplayer/AC3Codec/Makefile.in 2009-09-03 11:42:46.000000000 +0200
+++ xbmc-9.11-10.1/xbmc/cores/paplayer/AC3Codec/Makefile.in 2010-01-26 05:14:09.000000000 +0100
@@ -1,5 +1,5 @@
ARCH=@ARCH@
-CFLAGS=-D_LINUX -fPIC -Iinclude -Ivc++
+CFLAGS=-D_LINUX -fPIC -Iinclude
ifeq ($(findstring osx,$(ARCH)), osx)
export MACOSX_DEPLOYMENT_TARGET=10.4
CFLAGS+=-fno-common -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4
@@ -20,7 +20,7 @@
../../../../tools/Mach5/wrapper.rb $@;mv output.so $@
chmod +x $@
else
- $(CC) -fPIC -shared -o $@ $(OBJS) \
+ $(CC) $(CFLAGS) -shared -o $@ $(OBJS) \
`cat ../../DllLoader/exports/wrapper.def` ../../DllLoader/exports/wrapper.o
endif
diff -Naur xbmc-9.11-10.0/xbmc/cores/paplayer/ADPCMCodec/Makefile.in xbmc-9.11-10.1/xbmc/cores/paplayer/ADPCMCodec/Makefile.in
--- xbmc-9.11-10.0/xbmc/cores/paplayer/ADPCMCodec/Makefile.in 2009-03-22 19:56:49.000000000 +0100
+++ xbmc-9.11-10.1/xbmc/cores/paplayer/ADPCMCodec/Makefile.in 2010-01-26 05:14:09.000000000 +0100
@@ -1,7 +1,7 @@
ARCH=@ARCH@
OBJS=uXboxAdpcmDecoder.o ADPCMDll.o
-CFLAGS +=-D_LINUX -fPIC -O2
-CXXFLAGS += -D_LINUX -fPIC -O2
+CFLAGS +=-D_LINUX -fPIC
+CXXFLAGS += -D_LINUX -fPIC
SLIB=../../../../system/players/paplayer/adpcm-@ARCH@.so
@@ -11,7 +11,7 @@
../../../../tools/Mach5/wrapper.rb $@;mv output.so $@
chmod +x $@
else
- $(CC) -shared -o $@ *.o `cat ../../DllLoader/exports/wrapper.def` ../../DllLoader/exports/wrapper.o
+ $(CC) $(CFLAGS) -shared -o $@ *.o `cat ../../DllLoader/exports/wrapper.def` ../../DllLoader/exports/wrapper.o
endif
include ../../../../Makefile.include
diff -Naur xbmc-9.11-10.0/xbmc/cores/paplayer/FLACCodec/Makefile.in xbmc-9.11-10.1/xbmc/cores/paplayer/FLACCodec/Makefile.in
--- xbmc-9.11-10.0/xbmc/cores/paplayer/FLACCodec/Makefile.in 2009-10-07 10:28:05.000000000 +0200
+++ xbmc-9.11-10.1/xbmc/cores/paplayer/FLACCodec/Makefile.in 2010-01-26 05:14:09.000000000 +0100
@@ -19,12 +19,12 @@
else
ifneq (@USE_EXTERNAL_LIBFLAC@,1)
$(FLAC_LIB): flac-1.2.1/src/libFLAC/.libs/libFLAC.a
- $(CC) -shared -fpic -o $@ -rdynamic \
+ $(CC) $(CFLAGS) -shared -fpic -o $@ -rdynamic \
-Wl,--whole-archive flac-1.2.1/src/libFLAC/.libs/libFLAC.a -Wl,--no-whole-archive \
`cat ../../DllLoader/exports/wrapper.def` ../../DllLoader/exports/wrapper.o
else
$(FLAC_LIB):
- $(CC) -shared -fpic -o $@ -rdynamic -lFLAC \
+ $(CC) $(CFLAGS) -shared -fpic -o $@ -rdynamic -lFLAC \
`cat ../../DllLoader/exports/wrapper.def` ../../DllLoader/exports/wrapper.o
endif
endif
diff -Naur xbmc-9.11-10.0/xbmc/cores/paplayer/GYMCodec/Makefile.in xbmc-9.11-10.1/xbmc/cores/paplayer/GYMCodec/Makefile.in
--- xbmc-9.11-10.0/xbmc/cores/paplayer/GYMCodec/Makefile.in 2009-09-03 11:42:46.000000000 +0200
+++ xbmc-9.11-10.1/xbmc/cores/paplayer/GYMCodec/Makefile.in 2010-01-26 05:14:09.000000000 +0100
@@ -15,7 +15,7 @@
../../../../tools/Mach5/wrapper.rb $@;mv output.so $@
chmod +x $@
else
- $(CXX) -shared -o $@ *.o `cat ../../DllLoader/exports/wrapper.def` ../../DllLoader/exports/wrapper.o
+ $(CXX) $(CXXFLAGS) -shared -o $@ *.o `cat ../../DllLoader/exports/wrapper.def` ../../DllLoader/exports/wrapper.o
endif
diff -Naur xbmc-9.11-10.0/xbmc/cores/paplayer/MACDll/Makefile.in xbmc-9.11-10.1/xbmc/cores/paplayer/MACDll/Makefile.in
--- xbmc-9.11-10.0/xbmc/cores/paplayer/MACDll/Makefile.in 2009-10-07 10:28:05.000000000 +0200
+++ xbmc-9.11-10.1/xbmc/cores/paplayer/MACDll/Makefile.in 2010-01-26 05:14:09.000000000 +0100
@@ -65,7 +65,7 @@
../../../../tools/Mach5/wrapper.rb $@;mv output.so $@
chmod +x $@
else
- $(CC) -fPIC -shared -o $@ $(OBJS) \
+ $(CC) $(CFLAGS) -shared -o $@ $(OBJS) \
`cat ../../DllLoader/exports/wrapper.def` ../../DllLoader/exports/wrapper.o
endif
diff -Naur xbmc-9.11-10.0/xbmc/cores/paplayer/ModuleCodec/Makefile.in xbmc-9.11-10.1/xbmc/cores/paplayer/ModuleCodec/Makefile.in
--- xbmc-9.11-10.0/xbmc/cores/paplayer/ModuleCodec/Makefile.in 2009-11-08 02:23:56.000000000 +0100
+++ xbmc-9.11-10.1/xbmc/cores/paplayer/ModuleCodec/Makefile.in 2010-01-26 05:14:09.000000000 +0100
@@ -17,7 +17,7 @@
chmod +x $@
else
- $(CXX) -fPIC -shared -o $@ $(OBJS) -Wl,--whole-archive dumb/lib/unix/libdumb.a \
+ $(CXX) $(CXXFLAGS) -shared -o $@ $(OBJS) -Wl,--whole-archive dumb/lib/unix/libdumb.a \
-Wl,--no-whole-archive `cat ../../DllLoader/exports/wrapper.def` \
../../DllLoader/exports/wrapper.o
diff -Naur xbmc-9.11-10.0/xbmc/cores/paplayer/NSFCodec/Makefile.in xbmc-9.11-10.1/xbmc/cores/paplayer/NSFCodec/Makefile.in
--- xbmc-9.11-10.0/xbmc/cores/paplayer/NSFCodec/Makefile.in 2009-09-03 11:42:46.000000000 +0200
+++ xbmc-9.11-10.1/xbmc/cores/paplayer/NSFCodec/Makefile.in 2010-01-26 05:14:09.000000000 +0100
@@ -20,7 +20,7 @@
../../../../tools/Mach5/wrapper.rb $@;mv output.so $@
chmod +x $@
else
- $(CC) -fPIC -shared -o $@ $(OBJS) `cat ../../DllLoader/exports/wrapper.def` ../../DllLoader/exports/wrapper.o
+ $(CC) $(CFLAGS) -shared -o $@ $(OBJS) `cat ../../DllLoader/exports/wrapper.def` ../../DllLoader/exports/wrapper.o
endif
include ../../../../Makefile.include
diff -Naur xbmc-9.11-10.0/xbmc/cores/paplayer/SIDCodec/Makefile.in xbmc-9.11-10.1/xbmc/cores/paplayer/SIDCodec/Makefile.in
--- xbmc-9.11-10.0/xbmc/cores/paplayer/SIDCodec/Makefile.in 2009-09-03 11:42:46.000000000 +0200
+++ xbmc-9.11-10.1/xbmc/cores/paplayer/SIDCodec/Makefile.in 2010-01-26 05:14:09.000000000 +0100
@@ -17,7 +17,7 @@
../../../../tools/Mach5/wrapper.rb $@;mv output.so $@
chmod +x $@
else
- $(CC) -fPIC -shared -o $@ $(OBJS) ../../../linux/XHandle.o `cat ../../DllLoader/exports/wrapper.def` ../../DllLoader/exports/wrapper.o
+ $(CC) $(CFLAGS) -shared -o $@ $(OBJS) ../../../linux/XHandle.o `cat ../../DllLoader/exports/wrapper.def` ../../DllLoader/exports/wrapper.o
endif
include ../../../../Makefile.include
diff -Naur xbmc-9.11-10.0/xbmc/cores/paplayer/SPCCodec/SNES/SNESAPU/Makefile.in xbmc-9.11-10.1/xbmc/cores/paplayer/SPCCodec/SNES/SNESAPU/Makefile.in
--- xbmc-9.11-10.0/xbmc/cores/paplayer/SPCCodec/SNES/SNESAPU/Makefile.in 2009-03-22 19:56:49.000000000 +0100
+++ xbmc-9.11-10.1/xbmc/cores/paplayer/SPCCodec/SNES/SNESAPU/Makefile.in 2010-01-26 05:14:09.000000000 +0100
@@ -1,8 +1,8 @@
ARCH=@ARCH@
AS=nasm
OBJS=SPC700.o APU.o DSP.o SNESAPU.o
-CFLAGS +=-D_LINUX -fPIC -I../../ -O2
-CXXFLAGS +=-D_LINUX -fPIC -I../../ -O2
+CFLAGS +=-D_LINUX -fPIC -I../..
+CXXFLAGS +=-D_LINUX -fPIC -I../..
ifeq ($(findstring osx,$(ARCH)), osx)
CFLAGS+=-fno-common
CXXFLAGS+=-fno-common
@@ -25,7 +25,7 @@
../../../../../../tools/Mach5/wrapper.rb $@;mv output.so $@
chmod +x $@
else
- $(CC) -shared -o $@ $(OBJS) \
+ $(CC) $(CFLAGS) -shared -o $@ $(OBJS) \
`cat ../../../../DllLoader/exports/wrapper.def` ../../../../DllLoader/exports/wrapper.o
endif
diff -Naur xbmc-9.11-10.0/xbmc/cores/paplayer/timidity/Makefile.in xbmc-9.11-10.1/xbmc/cores/paplayer/timidity/Makefile.in
--- xbmc-9.11-10.0/xbmc/cores/paplayer/timidity/Makefile.in 2009-09-03 11:42:46.000000000 +0200
+++ xbmc-9.11-10.1/xbmc/cores/paplayer/timidity/Makefile.in 2010-01-26 05:14:09.000000000 +0100
@@ -1,6 +1,6 @@
ARCH=@ARCH@
-CFLAGS+=-D_LINUX -fPIC -O2 -DHAVE_GETTIMEOFDAY -I. -Itimidity -Ilibarc -Iutils
+CFLAGS+=-D_LINUX -fPIC -DHAVE_GETTIMEOFDAY -I. -Itimidity -Ilibarc -Iutils
ifeq ($(ARCH), powerpc-osx)
BUNDLE1_O=-lbundle1.o -L/usr/lib/gcc/powerpc-apple-darwin8/4.0.1/ -lgcc
endif
@@ -57,7 +57,7 @@
../../../../tools/Mach5/wrapper.rb $@;mv output.so $@
chmod +x $@
else
- $(CXX) -shared -o $@ $(OBJS) `cat ../../DllLoader/exports/wrapper.def` ../../DllLoader/exports/wrapper.o -Wl,--version-script=exports.def
+ $(CXX) $(CXXFLAGS) -shared -o $@ $(OBJS) `cat ../../DllLoader/exports/wrapper.def` ../../DllLoader/exports/wrapper.o -Wl,--version-script=exports.def
endif
include ../../../../Makefile.include
diff -Naur xbmc-9.11-10.0/xbmc/cores/paplayer/vgmstream/Makefile.in xbmc-9.11-10.1/xbmc/cores/paplayer/vgmstream/Makefile.in
--- xbmc-9.11-10.0/xbmc/cores/paplayer/vgmstream/Makefile.in 2009-03-23 00:27:25.000000000 +0100
+++ xbmc-9.11-10.1/xbmc/cores/paplayer/vgmstream/Makefile.in 2010-01-26 05:14:09.000000000 +0100
@@ -4,8 +4,8 @@
CFLAGS +=-D_LINUX -fPIC -DPIC -O3 -DXBMC
CXXFLAGS +=-D_LINUX -fPIC -DPIC -O3 -DXBMC
else
- CFLAGS +=-D_LINUX -fPIC -DPIC -O3 -fno-stack-protector -DXBMC
- CXXFLAGS +=-D_LINUX -fPIC -DPIC -O3 -fno-stack-protector -DXBMC
+ CFLAGS +=-D_LINUX -fPIC -DXBMC
+ CXXFLAGS +=-D_LINUX -fPIC -DXBMC
endif
CODING_OBJS=src/coding/acm_decoder.o \
diff -Naur xbmc-9.11-10.0/xbmc/cores/paplayer/vorbisfile/Makefile.in xbmc-9.11-10.1/xbmc/cores/paplayer/vorbisfile/Makefile.in
--- xbmc-9.11-10.0/xbmc/cores/paplayer/vorbisfile/Makefile.in 2009-09-03 11:42:46.000000000 +0200
+++ xbmc-9.11-10.1/xbmc/cores/paplayer/vorbisfile/Makefile.in 2010-01-26 05:14:09.000000000 +0100
@@ -33,7 +33,7 @@
../../../../tools/Mach5/wrapper.rb $@;mv output.so $@
chmod +x $@
else
- $(CC) -shared -o $@ $(VORBIS_LINK_OPTS) $(OGG_LINK_OPTS) \
+ $(CC) $(CFLAGS) -shared -o $@ $(VORBIS_LINK_OPTS) $(OGG_LINK_OPTS) \
`cat ../../DllLoader/exports/wrapper.def` \
../../DllLoader/exports/wrapper.o
endif
diff -Naur xbmc-9.11-10.0/xbmc/cores/paplayer/WavPackCodec/Makefile.in xbmc-9.11-10.1/xbmc/cores/paplayer/WavPackCodec/Makefile.in
--- xbmc-9.11-10.0/xbmc/cores/paplayer/WavPackCodec/Makefile.in 2009-09-03 11:42:46.000000000 +0200
+++ xbmc-9.11-10.1/xbmc/cores/paplayer/WavPackCodec/Makefile.in 2010-01-26 05:14:09.000000000 +0100
@@ -14,7 +14,7 @@
../../../../tools/Mach5/wrapper.rb $@;mv output.so $@
chmod +x $@
else
- $(CC) -fPIC -shared -o $@ $(OBJS) `cat ../../DllLoader/exports/wrapper.def` ../../DllLoader/exports/wrapper.o
+ $(CC) $(CFLAGS) -shared -o $@ $(OBJS) `cat ../../DllLoader/exports/wrapper.def` ../../DllLoader/exports/wrapper.o
endif
include ../../../../Makefile.include
diff -Naur xbmc-9.11-10.0/xbmc/cores/paplayer/YMCodec/StSoundLibrary/Makefile.in xbmc-9.11-10.1/xbmc/cores/paplayer/YMCodec/StSoundLibrary/Makefile.in
--- xbmc-9.11-10.0/xbmc/cores/paplayer/YMCodec/StSoundLibrary/Makefile.in 2009-09-03 11:42:46.000000000 +0200
+++ xbmc-9.11-10.1/xbmc/cores/paplayer/YMCodec/StSoundLibrary/Makefile.in 2010-01-26 05:14:09.000000000 +0100
@@ -17,7 +17,7 @@
../../../../../tools/Mach5/wrapper.rb $@;mv output.so $@
chmod +x $@
else
- $(CC) -fPIC -shared -o $@ $(OBJS) `cat ../../../DllLoader/exports/wrapper.def` ../../../DllLoader/exports/wrapper.o
+ $(CC) $(CFLAGS) -shared -o $@ $(OBJS) `cat ../../../DllLoader/exports/wrapper.def` ../../../DllLoader/exports/wrapper.o
endif
include ../../../../../Makefile.include
diff -Naur xbmc-9.11-10.0/xbmc/lib/libid3tag/Makefile.in xbmc-9.11-10.1/xbmc/lib/libid3tag/Makefile.in
--- xbmc-9.11-10.0/xbmc/lib/libid3tag/Makefile.in 2009-10-07 10:28:05.000000000 +0200
+++ xbmc-9.11-10.1/xbmc/lib/libid3tag/Makefile.in 2010-01-26 05:14:09.000000000 +0100
@@ -16,7 +16,7 @@
chmod +x $@
else
$(SLIB): libid3tag/.libs/libid3tag.so
- $(CXX) -shared -fPIC -O3 -o $@ libid3tag/.libs/*.o \
+ $(CXX) $(CXXFLAGS) -shared -fPIC -o $@ libid3tag/.libs/*.o \
`cat ../../cores/DllLoader/exports/wrapper.def` \
../../cores/DllLoader/exports/wrapper.o
endif
diff -Naur xbmc-9.11-10.0/xbmc/visualizations/Goom/Makefile.in xbmc-9.11-10.1/xbmc/visualizations/Goom/Makefile.in
--- xbmc-9.11-10.0/xbmc/visualizations/Goom/Makefile.in 2009-03-23 01:04:05.000000000 +0100
+++ xbmc-9.11-10.1/xbmc/visualizations/Goom/Makefile.in 2010-01-26 05:14:09.000000000 +0100
@@ -2,7 +2,7 @@
INCLUDES=-I. -I.. -I../../linux -I../../ -I../../../guilib -I../../../visualisations -Igoom2k4-0/src
OBJS=Main.o
SLIB=../../../visualisations/Goom.vis
-CXXFLAGS=-g -O3 -fPIC
+CXXFLAGS=-fPIC
DIRS=goom2k4-0
$(SLIB): $(OBJS) goom2k4-0/src/.libs/libgoom2.a
diff -Naur xbmc-9.11-10.0/xbmc/visualizations/XBMCProjectM/Makefile.in xbmc-9.11-10.1/xbmc/visualizations/XBMCProjectM/Makefile.in
--- xbmc-9.11-10.0/xbmc/visualizations/XBMCProjectM/Makefile.in 2009-07-09 02:00:27.000000000 +0200
+++ xbmc-9.11-10.1/xbmc/visualizations/XBMCProjectM/Makefile.in 2010-01-26 05:14:09.000000000 +0100
@@ -2,7 +2,7 @@
INCLUDES=-I. -I.. -I../../linux -I../../ -I../../../guilib -I../../../visualisations
OBJS=Main.o
SLIB=../../../visualisations/ProjectM.vis
-CXXFLAGS=-O3 -g -fPIC
+CXXFLAGS=-fPIC
DIRS=libprojectM
ifeq ($(findstring osx,$(ARCH)), osx)
@@ -18,7 +18,7 @@
$(MAKE) -C libprojectM
else
$(SLIB): $(OBJS) libprojectM/libprojectM.so
- $(CXX) ./libprojectM/CMakeFiles/projectM.dir/*.o -fPIC -shared $(CFLAGS) -o $(SLIB) $(OBJS) `cat ../../cores/DllLoader/exports/wrapper.def` ../../cores/DllLoader/exports/wrapper.o
+ $(CXX) $(CXXFLAGS) ./libprojectM/CMakeFiles/projectM.dir/*.o -fPIC -shared -o $(SLIB) $(OBJS) `cat ../../cores/DllLoader/exports/wrapper.def` ../../cores/DllLoader/exports/wrapper.o
libprojectM/libprojectM.so:
$(MAKE) -C libprojectM
xbmc-9.11-changeset-26191.diff:
lib/cximage-6.0/CxImage/DllInterface.cpp | 1 -
lib/libUPnP/Neptune/Source/Core/NptUtils.h | 2 +-
lib/libUPnP/Neptune/Source/System/StdC/NptStdCTime.cpp | 4 ++--
linux/NetworkLinux.cpp | 1 +
4 files changed, 4 insertions(+), 4 deletions(-)
--- NEW FILE xbmc-9.11-changeset-26191.diff ---
diff -Naur xbmc-9.11.orig/xbmc/lib/cximage-6.0/CxImage/DllInterface.cpp xbmc-9.11/xbmc/lib/cximage-6.0/CxImage/DllInterface.cpp
--- xbmc-9.11.orig/xbmc/lib/cximage-6.0/CxImage/DllInterface.cpp 2009-10-24 06:12:27.000000000 +0200
+++ xbmc-9.11/xbmc/lib/cximage-6.0/CxImage/DllInterface.cpp 2010-01-02 10:49:17.000000000 +0100
@@ -188,7 +188,6 @@
int ResampleKeepAspectArea(CxImage &image, unsigned int area)
{
- bool bResize = false;
float fAspect = ((float)image.GetWidth()) / ((float)image.GetHeight());
unsigned int width = (unsigned int)sqrt(area * fAspect);
unsigned int height = (unsigned int)sqrt(area / fAspect);
diff -Naur xbmc-9.11.orig/xbmc/linux/NetworkLinux.cpp xbmc-9.11/xbmc/linux/NetworkLinux.cpp
--- xbmc-9.11.orig/xbmc/linux/NetworkLinux.cpp 2009-11-20 05:52:25.000000000 +0100
+++ xbmc-9.11/xbmc/linux/NetworkLinux.cpp 2010-01-03 05:25:29.000000000 +0100
@@ -636,6 +636,7 @@
if (!fw)
{
// TODO
+ fclose(fr);
return;
}
diff -Naur xbmc-9.11.orig/xbmc/lib/libUPnP/Neptune/Source/Core/NptUtils.h xbmc-9.11/xbmc/lib/libUPnP/Neptune/Source/Core/NptUtils.h
--- xbmc-9.11.orig/xbmc/lib/libUPnP/Neptune/Source/Core/NptUtils.h 2009-07-06 10:12:52.000000000 +0200
+++ xbmc-9.11/xbmc/lib/libUPnP/Neptune/Source/Core/NptUtils.h 2010-01-02 08:26:18.000000000 +0100
@@ -205,7 +205,7 @@
#endif
#if defined(NPT_CONFIG_HAVE_MEMSET)
-#define NPT_SetMemory memset
+#define NPT_SetMemory(dest, c, s) memset(dest, c, s)
#else
extern void NPT_SetMemory(void* dest, int c, NPT_Size size);
#endif
diff -Naur xbmc-9.11.orig/xbmc/lib/libUPnP/Neptune/Source/System/StdC/NptStdCTime.cpp xbmc-9.11/xbmc/lib/libUPnP/Neptune/Source/System/StdC/NptStdCTime.cpp
--- xbmc-9.11.orig/xbmc/lib/libUPnP/Neptune/Source/System/StdC/NptStdCTime.cpp 2009-10-10 12:22:06.000000000 +0200
+++ xbmc-9.11/xbmc/lib/libUPnP/Neptune/Source/System/StdC/NptStdCTime.cpp 2010-01-02 08:26:48.000000000 +0100
@@ -90,7 +90,7 @@
time_t ltime;
struct tm gmt;
- NPT_SetMemory(&gmt, sizeof(gmt), 0);
+ NPT_SetMemory(&gmt, 0, sizeof(gmt));
ltime = (time_t) time.m_Seconds;
int result = gmtime_s(&gmt, <ime);
@@ -112,7 +112,7 @@
time_t ltime;
struct tm local;
- NPT_SetMemory(&local, sizeof(local), 0);
+ NPT_SetMemory(&local, 0, sizeof(local));
/* get the current time stamp */
NPT_CHECK_SEVERE(NPT_System::GetCurrentTimeStamp(now));
xbmc-9.11-configure.patch:
configure.in | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
--- NEW FILE xbmc-9.11-configure.patch ---
diff -Naur xbmc-9.11-11.0/configure.in xbmc-9.11-11.1/configure.in
--- xbmc-9.11-11.0/configure.in 2010-02-03 07:34:17.000000000 +0100
+++ xbmc-9.11-11.1/configure.in 2010-02-03 07:33:21.000000000 +0100
@@ -1217,9 +1217,12 @@
--cc="$CC"
else
./configure2 \
- --extra-cflags="-D_XBMC -fPIC -DPIC" \
+ --prefix="${prefix}" --includedir="${includedir}" --libdir="${libdir}" --datadir="${datadir}" \
+ --extra-cflags="$CFLAGS -D_XBMC -fPIC -DPIC" \
--enable-static \
--disable-shared \
+ --disable-strip \
+ --disable-opts \
--cc="$CC"
fi
], [0])
@@ -1317,10 +1320,12 @@
--disable-debugging \
--with-pic
else
- CFLAGS=-O3 \
./configure \
+ CPPFLAGS="$CPPFLAGS" \
+ CFLAGS="$CFLAGS -fPIC" \
+ CXXFLAGS="$CXXFLAGS -fPIC" \
+ --prefix="${prefix}" --includedir="${includedir}" --libdir="${libdir}" --datadir="${datadir}" \
--disable-static \
- --disable-debugging \
--with-pic
fi
], [0])
@@ -1333,7 +1338,7 @@
rm -f CMakeCache.txt && cmake -DCMAKE_BUILD_TYPE=None -DUSE_FTGL:BOOL=OFF \
-DCMAKE_C_FLAGS="${CFLAGS}" -DCMAKE_CXX_FLAGS="${CXXFLAGS}" \
-DCMAKE_INSTALL_PREFIX="${prefix}" -DCMAKE_INSTALL_LIBDIR:PATH="${libdir}" \
- -DINCLUDE_INSTALL_DIR:PATH="${includedir}" -DLIB_INSTALL_DIR:PATH="${_libdir}" \
+ -DINCLUDE_INSTALL_DIR:PATH="${includedir}" -DLIB_INSTALL_DIR:PATH="${libdir}" \
-DSYSCONF_INSTALL_DIR:PATH="${sysconfdir}" -DSHARE_INSTALL_PREFIX:PATH="${datadir}" .
set +x
fi
@@ -1342,10 +1347,13 @@
XB_CONFIG_MODULE([xbmc/visualizations/Goom/goom2k4-0],[
if test "$host_vendor" != "apple" ; then
./configure \
+ CPPFLAGS="$CPPFLAGS" \
+ CFLAGS="$CFLAGS -fPIC" \
+ CXXFLAGS="$CXXFLAGS -fPIC" \
+ --prefix="${prefix}" --includedir="${includedir}" --libdir="${libdir}" --datadir="${datadir}" \
--disable-shared \
--enable-static \
--with-pic
-
fi
], [$BUILD_GOOM])
xbmc-9.11-external-zlib.diff:
configure.in | 22 +++++++++++++++++++++-
xbmc/FileSystem/FileZip.h | 2 +-
xbmc/FileSystem/ZipDirectory.cpp | 2 +-
3 files changed, 23 insertions(+), 3 deletions(-)
--- NEW FILE xbmc-9.11-external-zlib.diff ---
diff -Naur xbmc-9.11-8/configure.in xbmc-9.11/configure.in
--- xbmc-9.11-8/configure.in 2010-01-21 14:04:04.000000000 +0100
+++ xbmc-9.11/configure.in 2010-01-21 18:58:26.000000000 +0100
@@ -59,6 +59,8 @@
external_libogg_disabled="== Use of external libogg disabled. =="
external_libwavpack_enabled="== Use of external libwavpack enabled. =="
external_libwavpack_disabled="== Use of external libwavpack disabled. =="
+external_libz_enabled="== Use of external libz enabled. =="
+external_libz_disabled="== Use of external libz disabled. =="
external_python_enabled="== Use of external python enabled. =="
external_python_disabled="== Use of external python disabled. =="
ffmpeg_vdpau_not_supported="== External ffmpeg doesn't support VDPAU. VDPAU support disabled. =="
@@ -223,6 +225,12 @@
[use_external_libwavpack=$enableval],
[use_external_libwavpack=no])
+AC_ARG_ENABLE([external-libz],
+ [AS_HELP_STRING([--enable-external-libz],
+ [enable use of external libz library (default is no)])],
+ [use_external_libz=$enableval],
+ [use_external_libz=no])
+
AC_ARG_ENABLE([external-python],
[AS_HELP_STRING([--enable-external-python],
[enable use of external python library (default is no) 'Linux only'])],
@@ -611,6 +619,18 @@
USE_EXTERNAL_LIBWAVPACK=0
fi
+# External libz
+if test "$use_external_libraries" = "yes" || test "$use_external_libz" = "yes"; then
+ AC_CHECK_LIB([z], [main],, AC_MSG_ERROR($missing_library))
+ AC_CHECK_HEADERS([zlib.h],, AC_MSG_ERROR([$missing_headers]))
+ AC_MSG_NOTICE($external_libz_enabled)
+ USE_EXTERNAL_LIBZ=1
+ AC_DEFINE([USE_EXTERNAL_LIBZ], [1], [Whether to use external libz library/zlib.])
+else
+ AC_MSG_NOTICE($external_libz_disabled)
+ USE_EXTERNAL_LIBZ=0
+fi
+
# External Python
if test "$use_external_libraries" = "yes" || test "$use_external_python" = "yes"; then
AC_CHECK_LIB([python2.6], [main],,
@@ -1276,7 +1296,7 @@
CFLAGS="-fPIC -fno-common -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" \
./configure
fi
-], [0])
+], [$USE_EXTERNAL_LIBZ])
XB_CONFIG_MODULE([xbmc/lib/libass], [
if test "$host_vendor" = "apple" ; then
diff -Naur xbmc-9.11-8/xbmc/FileSystem/FileZip.h xbmc-9.11/xbmc/FileSystem/FileZip.h
--- xbmc-9.11-8/xbmc/FileSystem/FileZip.h 2009-09-23 05:50:54.000000000 +0200
+++ xbmc-9.11/xbmc/FileSystem/FileZip.h 2010-01-21 16:48:18.000000000 +0100
@@ -23,7 +23,7 @@
#include "IFile.h"
-#include "lib/zlib/zlib.h"
+#include <zlib.h>
#include "utils/log.h"
#include "GUIWindowManager.h"
#include "FileSystem/File.h"
diff -Naur xbmc-9.11-8/xbmc/FileSystem/ZipDirectory.cpp xbmc-9.11/xbmc/FileSystem/ZipDirectory.cpp
--- xbmc-9.11-8/xbmc/FileSystem/ZipDirectory.cpp 2009-10-14 00:53:03.000000000 +0200
+++ xbmc-9.11/xbmc/FileSystem/ZipDirectory.cpp 2010-01-21 16:48:18.000000000 +0100
@@ -23,7 +23,7 @@
#include "utils/log.h"
#include "utils/CharsetConverter.h"
#include "Util.h"
-#include "lib/zlib/zlib.h"
+#include <zlib.h>
#include "URL.h"
#include "ZipManager.h"
#include "FileItem.h"
xbmc-9.11-fix-Makefile.in.patch:
Makefile.in | 58 +++++++++++++++++++++++++++-------------------------------
1 file changed, 27 insertions(+), 31 deletions(-)
--- NEW FILE xbmc-9.11-fix-Makefile.in.patch ---
--- Makefile.in.orig 2009-12-31 18:35:33.201505454 -0500
+++ Makefile.in 2009-12-31 18:36:29.747380027 -0500
@@ -416,7 +416,7 @@
$(MAKE) -C tools/TexturePacker/
install-bin: xbmc.bin # developement convenience target
- sudo install -D xbmc.bin $(prefix)/share/xbmc
+ sudo install -D xbmc.bin $(DESTDIR)$(libdir)/xbmc
ifeq ($(findstring osx,$(ARCH)), osx)
# TODO: add osx install
@@ -424,55 +424,51 @@
install: install-binaries install-arch install-datas install-web
install-binaries: install-scripts
- @echo "Copying XBMC binary to $(prefix)/share/xbmc/xbmc.bin"
- @install -D xbmc.bin $(prefix)/share/xbmc/xbmc.bin
- @install -D xbmc-xrandr $(prefix)/share/xbmc/xbmc-xrandr
+ @echo "Copying XBMC binary to $(DESTDIR)$(libdir)/xbmc/xbmc.bin"
+ @install -D xbmc.bin $(DESTDIR)$(libdir)/xbmc/xbmc.bin
+ @install -D xbmc-xrandr $(DESTDIR)$(libdir)/xbmc/xbmc-xrandr
@echo "You can run XBMC with the command 'xbmc'"
endif
install-arch:
- @# Arch dependent files
- @find system screensavers visualisations -regextype posix-extended -type f -not -iregex ".*svn.*|.*win32(dx)?\.vis|.*osx\.vis" -iregex ".*$(ARCH).*|.*\.vis|.*\.xbs" -exec install -D "{}" $(prefix)/share/xbmc/"{}" \; -printf " -- %-75.75f\r"
+ @find system screensavers visualisations -regextype posix-extended -type f -not -iregex ".*svn.*|.*win32(dx)?\.vis|.*osx\.vis" -iregex ".*$(ARCH).*|.*\.vis|.*\.xbs" -exec install -D "{}" $(DESTDIR)$(libdir)/xbmc/"{}" \; -printf " -- %-75.75f\r"
install-scripts:
- @install -D tools/Linux/xbmc.sh $(prefix)/bin/xbmc
- @install -D tools/Linux/xbmc-standalone.sh $(prefix)/bin/xbmc-standalone
- @install -D -m 0644 tools/Linux/FEH.py $(prefix)/share/xbmc/FEH.py
- @install -D -m 0644 tools/Linux/xbmc-xsession.desktop $(prefix)/share/xsessions/XBMC.desktop
+ @install -D tools/Linux/xbmc.sh $(DESTDIR)$(bindir)/xbmc
+ @install -D tools/Linux/xbmc-standalone.sh $(DESTDIR)$(bindir)/xbmc-standalone
+ @install -D -m 0644 tools/Linux/FEH.py $(DESTDIR)$(libdir)/xbmc/FEH.py
+ @install -D -m 0644 tools/Linux/xbmc-xsession.desktop $(DESTDIR)$(prefix)/share/xsessions/XBMC.desktop
install-datas: install-scripts
@echo "Copying support and legal files..."
@for FILE in `ls README.linux LICENSE.GPL *.txt`; do \
- install -D -m 0644 "$$FILE" $(prefix)/share/xbmc/; done
+ install -D -m 0644 "$$FILE" $(DESTDIR)$(libdir)/xbmc/; done
@echo "Done!"
- @echo "Copying system files to $(prefix)/share/xbmc"
- @# Arch independent files
- @find language media scripts sounds userdata visualisations system -regextype posix-extended -type f -not -iregex ".*svn.*|.*\.so|.*\.dll|.*\.pyd|.*python/.*\.zlib|.*\.vis" -exec install -D -m 0644 "{}" $(prefix)/share/xbmc/"{}" \; -printf " -- %-75.75f\r"
- @# Skins
- @find skin -regextype posix-extended -type f -not -iregex '.*/\.svn/.*|^skin/[^/]*/media/.*[^x][^b][^t]' -exec install -D -m 0644 '{}' $(prefix)/share/xbmc/'{}' \; -printf " -- %-75.75f\r"
- @# Icons and links
- @mkdir -p $(prefix)/share/applications $(prefix)/share/pixmaps
- @cp -a tools/Linux/xbmc.png $(prefix)/share/pixmaps/
- @cp -a tools/Linux/xbmc.desktop $(prefix)/share/applications/
+ @echo "Copying system files to $(DESTDIR)$(libdir)/xbmc"
+ @find language media scripts sounds userdata visualisations system -regextype posix-extended -type f -not -iregex ".*svn.*|.*\.so|.*\.dll|.*\.pyd|.*python/.*\.zlib|.*\.vis" -exec install -D -m 0644 "{}" $(DESTDIR)$(libdir)/xbmc/"{}" \; -printf " -- %-75.75f\r"
+ @find skin -regextype posix-extended -type f -not -iregex '.*/\.svn/.*|^skin/[^/]*/media/.*[^x][^b][^t]' -exec install -D -m 0644 '{}' $(DESTDIR)$(libdir)/xbmc/'{}' \; -printf " -- %-75.75f\r"
+ @mkdir -p $(DESTDIR)$(prefix)/share/applications $(DESTDIR)$(prefix)/share/pixmaps
+ @cp -a tools/Linux/xbmc.png $(DESTDIR)$(prefix)/share/pixmaps/
+ @cp -a tools/Linux/xbmc.desktop $(DESTDIR)$(prefix)/share/applications/
install-livedatas:
@echo "Install Live CD datas in $(prefix) ..."
- @mkdir -p $(prefix)/bin
- @install -D tools/XBMCLive/diskmounter $(prefix)/bin
- @install -D tools/XBMCLive/installXBMC $(prefix)/bin
- @install -D tools/XBMCLive/runXBMC $(prefix)/bin
- @install -D tools/XBMCLive/setAlsaVolumes $(prefix)/bin
+ @mkdir -p $(DESTDIR)$(bindir)
+ @install -D tools/XBMCLive/diskmounter $(DESTDIR)$(bindir)
+ @install -D tools/XBMCLive/installXBMC $(DESTDIR)$(bindir)
+ @install -D tools/XBMCLive/runXBMC $(DESTDIR)$(bindir)
+ @install -D tools/XBMCLive/setAlsaVolumes $(DESTDIR)$(bindir)
install-web:
- @mkdir -p $(prefix)/share/xbmc/web
- @cp -r web/Project_Mayhem_III/* $(prefix)/share/xbmc/web
- @find $(prefix)/share/xbmc/web -depth -name .svn -exec rm -rf {} \;
+ @mkdir -p $(DESTDIR)$(libdir)/xbmc/web
+ @cp -r web/Project_Mayhem_III/* $(DESTDIR)$(libdir)/xbmc/web
+ @find $(DESTDIR)$(libdir)/xbmc/web -depth -name .svn -exec rm -rf {} \;
uninstall:
@echo "Removing XBMC..."
- @rm -rf $(prefix)/share/xbmc $(prefix)/bin/xbmc
- @rm -rf $(prefix)/bin/xbmc-standalone
- @rm -rf $(prefix)/share/xsessions/XBMC.desktop
+ @rm -rf $(DESTDIR)$(libdir)/xbmc $(DESTDIR)$(bindir)/xbmc
+ @rm -rf $(DESTDIR)$(bindir)/xbmc-standalone
+ @rm -rf $(DESTDIR)$(prefix)/share/xsessions/XBMC.desktop
@echo "Done!"
reallyclean:
xbmc-9.11-goom-missing.diff:
missing | 274 +++++++++++++++++++++++++++++++++++++++++++++++++++++-----------
1 file changed, 230 insertions(+), 44 deletions(-)
--- NEW FILE xbmc-9.11-goom-missing.diff ---
diff -Naur xbmc-9.11.orig/xbmc/visualizations/Goom/goom2k4-0/missing xbmc-9.11/xbmc/visualizations/Goom/goom2k4-0/missing
--- xbmc-9.11.orig/xbmc/visualizations/Goom/goom2k4-0/missing 2009-08-31 22:54:54.000000000 +0200
+++ xbmc-9.11/xbmc/visualizations/Goom/goom2k4-0/missing 2010-01-02 06:09:10.000000000 +0100
@@ -1,7 +1,11 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-# Copyright (C) 1996, 1997 Free Software Foundation, Inc.
-# Franc,ois Pinard <pinard(a)iro.umontreal.ca>, 1996.
+
+scriptversion=2009-04-28.21; # UTC
+
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
+# 2008, 2009 Free Software Foundation, Inc.
+# Originally by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -14,16 +18,48 @@
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
if test $# -eq 0; then
echo 1>&2 "Try \`$0 --help' for more information"
exit 1
fi
-case "$1" in
+run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
+
+# In the cases where this matters, `missing' is being run in the
+# srcdir already.
+if test -f configure.ac; then
+ configure_ac=configure.ac
+else
+ configure_ac=configure.in
+fi
+
+msg="missing on your system"
+
+case $1 in
+--run)
+ # Try to run requested program, and just exit if it succeeds.
+ run=
+ shift
+ "$@" && exit 0
+ # Exit code 63 means version mismatch. This often happens
+ # when the user try to use an ancient version of a tool on
+ # a file that requires a minimum version. In this case we
+ # we should proceed has if the program had been absent, or
+ # if --run hadn't been passed.
+ if test $? = 63; then
+ run=:
+ msg="probably too old"
+ fi
+ ;;
-h|--h|--he|--hel|--help)
echo "\
@@ -35,21 +71,32 @@
Options:
-h, --help display this help and exit
-v, --version output version information and exit
+ --run try to run the given command, and emulate it if it fails
Supported PROGRAM values:
aclocal touch file \`aclocal.m4'
autoconf touch file \`configure'
autoheader touch file \`config.h.in'
+ autom4te touch the output file, or create a stub one
automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
+ help2man touch the output file
lex create \`lex.yy.c', if possible, from existing .c
makeinfo touch the output file
- yacc create \`y.tab.[ch]', if possible, from existing .[ch]"
+ tar try tar, gnutar, gtar, then tar without non-portable flags
+ yacc create \`y.tab.[ch]', if possible, from existing .[ch]
+
+Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
+\`g' are ignored when checking the name.
+
+Send bug reports to <bug-automake(a)gnu.org>."
+ exit $?
;;
-v|--v|--ve|--ver|--vers|--versi|--versio|--version)
- echo "missing - GNU libit 0.0"
+ echo "missing $scriptversion (GNU Automake)"
+ exit $?
;;
-*)
@@ -58,35 +105,77 @@
exit 1
;;
- aclocal)
+esac
+
+# normalize program name to check for.
+program=`echo "$1" | sed '
+ s/^gnu-//; t
+ s/^gnu//; t
+ s/^g//; t'`
+
+# Now exit if we have it, but it failed. Also exit now if we
+# don't have it and --version was passed (most likely to detect
+# the program). This is about non-GNU programs, so use $1 not
+# $program.
+case $1 in
+ lex*|yacc*)
+ # Not GNU programs, they don't have --version.
+ ;;
+
+ tar*)
+ if test -n "$run"; then
+ echo 1>&2 "ERROR: \`tar' requires --run"
+ exit 1
+ elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
+ exit 1
+ fi
+ ;;
+
+ *)
+ if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+ # We have it, but it failed.
+ exit 1
+ elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
+ # Could not run --version or --help. This is probably someone
+ # running `$TOOL --version' or `$TOOL --help' to check whether
+ # $TOOL exists and not knowing $TOOL uses missing.
+ exit 1
+ fi
+ ;;
+esac
+
+# If it does not exist, or fails to run (possibly an outdated version),
+# try to emulate it.
+case $program in
+ aclocal*)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
- you modified \`acinclude.m4' or \`configure.in'. You might want
+WARNING: \`$1' is $msg. You should only need it if
+ you modified \`acinclude.m4' or \`${configure_ac}'. You might want
to install the \`Automake' and \`Perl' packages. Grab them from
any GNU archive site."
touch aclocal.m4
;;
- autoconf)
+ autoconf*)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
- you modified \`configure.in'. You might want to install the
+WARNING: \`$1' is $msg. You should only need it if
+ you modified \`${configure_ac}'. You might want to install the
\`Autoconf' and \`GNU m4' packages. Grab them from any GNU
archive site."
touch configure
;;
- autoheader)
+ autoheader*)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
- you modified \`acconfig.h' or \`configure.in'. You might want
+WARNING: \`$1' is $msg. You should only need it if
+ you modified \`acconfig.h' or \`${configure_ac}'. You might want
to install the \`Autoconf' and \`GNU m4' packages. Grab them
from any GNU archive site."
- files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' configure.in`
+ files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
- case "$f" in
+ case $f in
*:*) touch_files="$touch_files "`echo "$f" |
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
*) touch_files="$touch_files $f.in";;
@@ -95,10 +184,10 @@
touch $touch_files
;;
- automake)
+ automake*)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
- you modified \`Makefile.am', \`acinclude.m4' or \`configure.in'.
+WARNING: \`$1' is $msg. You should only need it if
+ you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
You might want to install the \`Automake' and \`Perl' packages.
Grab them from any GNU archive site."
find . -type f -name Makefile.am -print |
@@ -106,81 +195,170 @@
while read f; do touch "$f"; done
;;
- bison|yacc)
+ autom4te*)
+ echo 1>&2 "\
+WARNING: \`$1' is needed, but is $msg.
+ You might have modified some files without having the
+ proper tools for further handling them.
+ You can get \`$1' as part of \`Autoconf' from any GNU
+ archive site."
+
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -f "$file"; then
+ touch $file
+ else
+ test -z "$file" || exec >$file
+ echo "#! /bin/sh"
+ echo "# Created by GNU Automake missing as a replacement of"
+ echo "# $ $@"
+ echo "exit 0"
+ chmod +x $file
+ exit 1
+ fi
+ ;;
+
+ bison*|yacc*)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' $msg. You should only need it if
you modified a \`.y' file. You may need the \`Bison' package
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
rm -f y.tab.c y.tab.h
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.c
fi
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.h
fi
;;
esac
fi
- if [ ! -f y.tab.h ]; then
+ if test ! -f y.tab.h; then
echo >y.tab.h
fi
- if [ ! -f y.tab.c ]; then
+ if test ! -f y.tab.c; then
echo 'main() { return 0; }' >y.tab.c
fi
;;
- lex|flex)
+ lex*|flex*)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified a \`.l' file. You may need the \`Flex' package
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
rm -f lex.yy.c
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" lex.yy.c
fi
;;
esac
fi
- if [ ! -f lex.yy.c ]; then
+ if test ! -f lex.yy.c; then
echo 'main() { return 0; }' >lex.yy.c
fi
;;
- makeinfo)
+ help2man*)
+ echo 1>&2 "\
+WARNING: \`$1' is $msg. You should only need it if
+ you modified a dependency of a manual page. You may need the
+ \`Help2man' package in order for those modifications to take
+ effect. You can get \`Help2man' from any GNU archive site."
+
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -f "$file"; then
+ touch $file
+ else
+ test -z "$file" || exec >$file
+ echo ".ab help2man is required to generate this page"
+ exit $?
+ fi
+ ;;
+
+ makeinfo*)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified a \`.texi' or \`.texinfo' file, or any other file
indirectly affecting the aspect of the manual. The spurious
call might also be the consequence of using a buggy \`make' (AIX,
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ # The file to touch is that specified with -o ...
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -z "$file"; then
- file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
+ # ... or it is the one specified with @setfilename ...
+ infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
+ file=`sed -n '
+ /^@setfilename/{
+ s/.* \([^ ]*\) *$/\1/
+ p
+ q
+ }' $infile`
+ # ... or it is derived from the source name (dir/f.texi becomes f.info)
+ test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
fi
+ # If the file does not exist, the user really needs makeinfo;
+ # let's fail without touching anything.
+ test -f $file || exit 1
touch $file
;;
+ tar*)
+ shift
+
+ # We have already tried tar in the generic part.
+ # Look for gnutar/gtar before invocation to avoid ugly error
+ # messages.
+ if (gnutar --version > /dev/null 2>&1); then
+ gnutar "$@" && exit 0
+ fi
+ if (gtar --version > /dev/null 2>&1); then
+ gtar "$@" && exit 0
+ fi
+ firstarg="$1"
+ if shift; then
+ case $firstarg in
+ *o*)
+ firstarg=`echo "$firstarg" | sed s/o//`
+ tar "$firstarg" "$@" && exit 0
+ ;;
+ esac
+ case $firstarg in
+ *h*)
+ firstarg=`echo "$firstarg" | sed s/h//`
+ tar "$firstarg" "$@" && exit 0
+ ;;
+ esac
+ fi
+
+ echo 1>&2 "\
+WARNING: I can't seem to be able to run \`tar' with the given arguments.
+ You may want to install GNU tar or Free paxutils, or check the
+ command line arguments."
+ exit 1
+ ;;
+
*)
echo 1>&2 "\
-WARNING: \`$1' is needed, and you do not seem to have it handy on your
- system. You might have modified some files without having the
+WARNING: \`$1' is needed, and is $msg.
+ You might have modified some files without having the
proper tools for further handling them. Check the \`README' file,
- it often tells you about the needed prerequirements for installing
+ it often tells you about the needed prerequisites for installing
this package. You may also peek at any GNU archive site, in case
some other package would contain this missing \`$1' program."
exit 1
@@ -188,3 +366,11 @@
esac
exit 0
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
xbmc-9.11-gymcodec.patch:
ym2612.h | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
--- NEW FILE xbmc-9.11-gymcodec.patch ---
diff -Naur xbmc-9.11-11.0/xbmc/cores/paplayer/GYMCodec/ym2612.h xbmc-9.11-11.1/xbmc/cores/paplayer/GYMCodec/ym2612.h
--- xbmc-9.11-11.0/xbmc/cores/paplayer/GYMCodec/ym2612.h 2008-07-15 21:14:31.000000000 +0200
+++ xbmc-9.11-11.1/xbmc/cores/paplayer/GYMCodec/ym2612.h 2010-02-03 07:33:21.000000000 +0100
@@ -15,7 +15,7 @@
#define INLINE __inline
typedef struct slot__ {
- int *DT; // paramètre detune
+ unsigned int *DT; // paramètre detune
int MUL; // paramètre "multiple de fréquence"
int TL; // Total Level = volume lorsque l'enveloppe est au plus haut
int TLL; // Total Level ajusted
@@ -24,10 +24,10 @@
int KSR; // Key Scale Rate = cette valeur est calculée par rapport à la fréquence actuelle, elle va influer
// sur les différents paramètres de l'enveloppe comme l'attaque, le decay ... comme dans la réalité !
int SEG; // Type enveloppe SSG
- int *AR; // Attack Rate (table pointeur) = Taux d'attaque (AR[KSR])
- int *DR; // Decay Rate (table pointeur) = Taux pour la régression (DR[KSR])
- int *SR; // Sustin Rate (table pointeur) = Taux pour le maintien (SR[KSR])
- int *RR; // Release Rate (table pointeur) = Taux pour le relâchement (RR[KSR])
+ unsigned int *AR; // Attack Rate (table pointeur) = Taux d'attaque (AR[KSR])
+ unsigned int *DR; // Decay Rate (table pointeur) = Taux pour la régression (DR[KSR])
+ unsigned int *SR; // Sustin Rate (table pointeur) = Taux pour le maintien (SR[KSR])
+ unsigned int *RR; // Release Rate (table pointeur) = Taux pour le relâchement (RR[KSR])
int Fcnt; // Frequency Count = compteur-fréquence pour déterminer l'amplitude actuelle (SIN[Finc >> 16])
int Finc; // frequency step = pas d'incrémentation du compteur-fréquence
// plus le pas est grand, plus la fréquence est aïgu (ou haute)
xbmc-9.11-hdhomerun.patch:
Makefile.in | 5 --
configure.in | 1
xbmc/FileSystem/HDHomeRun.h | 78 +++++++++++++++++++++++++++++---------------
3 files changed, 53 insertions(+), 31 deletions(-)
--- NEW FILE xbmc-9.11-hdhomerun.patch ---
--- xbmc-9.11/Makefile.in.orig 2010-03-06 13:36:20.065364213 +0100
+++ xbmc-9.11/Makefile.in 2010-03-06 13:36:50.136366154 +0100
@@ -82,7 +82,6 @@
LIB_DIRS=\
xbmc/lib/cximage-6.0 \
xbmc/lib/libexif \
- xbmc/lib/libhdhomerun \
xbmc/lib/libid3tag \
xbmc/lib/libPython/linux
@@ -273,8 +272,6 @@
endif
libexif: dllloader
$(MAKE) -C xbmc/lib/libexif
-libhdhomerun: dllloader
- $(MAKE) -C xbmc/lib/libhdhomerun
libid3tag: dllloader
$(MAKE) -C xbmc/lib/libid3tag
papcodecs: dllloader dvdpcodecs
@@ -304,7 +301,7 @@
$(MAKE) -C xbmc/lib/cximage-6.0
codecs: papcodecs dvdpcodecs
-libs: libhdhomerun libid3tag imagelib libexif python
+libs: libid3tag imagelib libexif python
externals: codecs libs python visualizations screensavers
xcode_depends: \
--- xbmc-9.11/xbmc/FileSystem/HDHomeRun.h.orig 2010-03-06 13:51:33.326488131 +0100
+++ xbmc-9.11/xbmc/FileSystem/HDHomeRun.h 2010-03-06 13:51:53.899488929 +0100
@@ -22,7 +22,7 @@
#include "IDirectory.h"
#include "DynamicDll.h"
-#include "lib/libhdhomerun/hdhomerun.h"
+#include <hdhomerun/hdhomerun.h>
#include "FileSystem/IFile.h"
class DllHdHomeRunInterface
@@ -44,31 +44,57 @@
class DllHdHomeRun : public DllDynamic, public DllHdHomeRunInterface
{
- DECLARE_DLL_WRAPPER(DllHdHomeRun, DLL_PATH_LIBHDHOMERUN)
- DEFINE_METHOD5(int, discover_find_devices_custom, (uint32_t p1, uint32_t p2, uint32_t p3, struct hdhomerun_discover_device_t p4[], int p5))
- DEFINE_METHOD2(struct hdhomerun_device_t*, device_create_from_str, (const char* p1, struct hdhomerun_debug_t *p2))
- DEFINE_METHOD1(void, device_destroy, (struct hdhomerun_device_t* p1))
- DEFINE_METHOD1(int, device_stream_start, (struct hdhomerun_device_t* p1))
- DEFINE_METHOD3(uint8_t*, device_stream_recv, (struct hdhomerun_device_t* p1, unsigned int p2, unsigned int* p3))
- DEFINE_METHOD1(void, device_stream_stop, (struct hdhomerun_device_t* p1))
- DEFINE_METHOD2(int, device_set_tuner_channel, (struct hdhomerun_device_t *p1, const char *p2))
- DEFINE_METHOD2(int, device_set_tuner_program, (struct hdhomerun_device_t *p1, const char *p2))
- DEFINE_METHOD2(int, device_set_tuner_from_str, (struct hdhomerun_device_t *p1, const char *p2))
- DEFINE_METHOD2(void, device_set_tuner, (struct hdhomerun_device_t *p1, unsigned int p2))
- DEFINE_METHOD3(int, device_get_tuner_status, (struct hdhomerun_device_t *p1, char **p2, struct hdhomerun_tuner_status_t *p3));
- BEGIN_METHOD_RESOLVE()
- RESOLVE_METHOD_RENAME(hdhomerun_discover_find_devices_custom, discover_find_devices_custom)
- RESOLVE_METHOD_RENAME(hdhomerun_device_create_from_str, device_create_from_str)
- RESOLVE_METHOD_RENAME(hdhomerun_device_destroy, device_destroy)
- RESOLVE_METHOD_RENAME(hdhomerun_device_stream_start, device_stream_start)
- RESOLVE_METHOD_RENAME(hdhomerun_device_stream_recv, device_stream_recv)
- RESOLVE_METHOD_RENAME(hdhomerun_device_stream_stop, device_stream_stop)
- RESOLVE_METHOD_RENAME(hdhomerun_device_set_tuner_channel, device_set_tuner_channel)
- RESOLVE_METHOD_RENAME(hdhomerun_device_set_tuner_program, device_set_tuner_program)
- RESOLVE_METHOD_RENAME(hdhomerun_device_set_tuner_from_str, device_set_tuner_from_str)
- RESOLVE_METHOD_RENAME(hdhomerun_device_set_tuner, device_set_tuner)
- RESOLVE_METHOD_RENAME(hdhomerun_device_get_tuner_status, device_get_tuner_status)
- END_METHOD_RESOLVE()
+public:
+ virtual ~DllHdHomeRun () {};
+
+ virtual int discover_find_devices_custom (uint32_t p1, uint32_t p2, uint32_t p3, struct hdhomerun_discover_device_t p4[], int p5)
+ { return ::hdhomerun_discover_find_devices_custom (p1, p2, p3, p4, p5); }
+
+ virtual struct hdhomerun_device_t *device_create_from_str (const char* p1, struct hdhomerun_debug_t *p2)
+ { return ::hdhomerun_device_create_from_str (p1, p2); }
+
+ virtual void device_destroy (struct hdhomerun_device_t* p1)
+ { ::hdhomerun_device_destroy (p1); }
+
+ virtual int device_stream_start (struct hdhomerun_device_t* p1)
+ { return ::hdhomerun_device_stream_start (p1); }
+
+
+ virtual uint8_t *device_stream_recv (struct hdhomerun_device_t* p1, unsigned int p2, unsigned int* p3)
+ {
+ uint8_t *retval;
+
+ size_t tmp = *p3;
+ retval = ::hdhomerun_device_stream_recv (p1, p2, &tmp);
+ *p3 = tmp;
+
+ return retval;
+ }
+
+ virtual void device_stream_stop (struct hdhomerun_device_t* p1)
+ { ::hdhomerun_device_stream_stop (p1); }
+
+ virtual int device_set_tuner_channel (struct hdhomerun_device_t *p1, const char *p2)
+ { return ::hdhomerun_device_set_tuner_channel (p1, p2); }
+
+ virtual int device_set_tuner_program (struct hdhomerun_device_t *p1, const char *p2)
+ { return ::hdhomerun_device_set_tuner_program (p1, p2); }
+
+
+ virtual int device_set_tuner_from_str (struct hdhomerun_device_t *p1, const char *p2)
+ { return ::hdhomerun_device_set_tuner_from_str (p1, p2); }
+
+
+ virtual void device_set_tuner (struct hdhomerun_device_t *p1, unsigned int p2)
+ { ::hdhomerun_device_set_tuner (p1, p2); }
+
+ virtual int device_get_tuner_status (struct hdhomerun_device_t *p1, char **p2, struct hdhomerun_tuner_status_t *p3)
+ { return ::hdhomerun_device_get_tuner_status (p1, p2, p3); }
+
+ // DLL faking.
+ virtual bool ResolveExports() { return true; }
+ virtual bool Load() { return true; }
+ virtual void Unload() {}
};
namespace DIRECTORY
--- xbmc-9.11/configure.in.orig 2010-03-06 13:44:45.670365692 +0100
+++ xbmc-9.11/configure.in 2010-03-06 13:44:57.298492458 +0100
@@ -989,7 +989,6 @@
xbmc/lib/libRTV/Makefile \
xbmc/lib/libexif/Makefile \
xbmc/lib/libXDAAP/Makefile \
- xbmc/lib/libhdhomerun/Makefile \
xbmc/lib/libshout/Makefile \
xbmc/lib/libsquish/Makefile \
xbmc/lib/libid3tag/Makefile \
xbmc-9.11-libdca.patch:
configure.in | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
--- NEW FILE xbmc-9.11-libdca.patch ---
--- xbmc-9.11-b1/configure.in.config 2009-11-18 02:47:48.000000000 +0100
+++ xbmc-9.11-b1/configure.in 2009-11-25 20:25:05.973069389 +0100
@@ -560,7 +560,7 @@
# External libdts
if test "$use_external_libraries" = "yes" || test "$use_external_libdts" = "yes"; then
- AC_CHECK_LIB([dts], [main],, AC_MSG_ERROR($missing_library))
+ AC_CHECK_LIB([dca], [main],, AC_MSG_ERROR($missing_library))
AC_MSG_NOTICE($external_libdts_enabled)
USE_EXTERNAL_LIBDTS=1
@@ -1054,6 +1054,8 @@
if [[ $3 != "1" ]]; then
if [[ -d $1 ]]; then
pushd $1
+ [[ -f configure ]] && chmod +x configure
+ [[ -f configure2 ]] && chmod +x configure2
$2
if [[ $? -ne 0 ]]; then
popd
xbmc-9.11-libid3tag.patch:
metadata.c | 3 +++
1 file changed, 3 insertions(+)
--- NEW FILE xbmc-9.11-libid3tag.patch ---
diff -Naur xbmc-9.11-11.0/xbmc/lib/libid3tag/libid3tag/metadata.c xbmc-9.11-11.1/xbmc/lib/libid3tag/libid3tag/metadata.c
--- xbmc-9.11-11.0/xbmc/lib/libid3tag/libid3tag/metadata.c 2009-10-13 02:48:48.000000000 +0200
+++ xbmc-9.11-11.1/xbmc/lib/libid3tag/libid3tag/metadata.c 2010-02-03 07:33:21.000000000 +0100
@@ -23,6 +23,9 @@
# include "config.h"
# endif
+#include <string.h>
+#include <stdlib.h>
+
# include "metadata.h"
# include "global.h"
# include "ucs4.h"
xbmc-9.11-librtv.patch:
Makefile.in | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE xbmc-9.11-librtv.patch ---
diff -Naur xbmc-9.11-11.0/xbmc/lib/libRTV/Makefile.in xbmc-9.11-11.1/xbmc/lib/libRTV/Makefile.in
--- xbmc-9.11-11.0/xbmc/lib/libRTV/Makefile.in 2009-03-22 19:56:49.000000000 +0100
+++ xbmc-9.11-11.1/xbmc/lib/libRTV/Makefile.in 2010-02-03 07:33:21.000000000 +0100
@@ -1,7 +1,7 @@
SRCS=crypt.c guideclient.c GuideParser.c httpclient.c httpfsclient.c interface.c md5.c netclient.c rtv.c sleep.c
-CFLAGS += -D_LINUX -D__unix__
-CXXFLAGS += -D_LINUX -D__unix__
+CFLAGS += -D_LINUX
+CXXFLAGS += -D_LINUX
LIB= librtv-@ARCH@.a
xbmc-9.11-macdll.patch:
Makefile.in | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE xbmc-9.11-macdll.patch ---
diff -Naur xbmc-9.11-11.0/xbmc/cores/paplayer/MACDll/Makefile.in xbmc-9.11-11.1/xbmc/cores/paplayer/MACDll/Makefile.in
--- xbmc-9.11-11.0/xbmc/cores/paplayer/MACDll/Makefile.in 2010-02-03 07:34:17.000000000 +0100
+++ xbmc-9.11-11.1/xbmc/cores/paplayer/MACDll/Makefile.in 2010-02-03 07:33:21.000000000 +0100
@@ -35,8 +35,8 @@
Source/MACLib/Old/AntiPredictorNormal.o \
Source/MACDll/MACDll.o
-CFLAGS +=-ISource/Shared -DPIC -fPIC -ISource/MACLib -pedantic -D__GNUC_IA32__ -DBUILD_CROSS_PLATFORM -D_LINUX
-CXXFLAGS +=-ISource/Shared -DPIC -fPIC -ISource/MACLib -pedantic -D__GNUC_IA32__ -DBUILD_CROSS_PLATFORM -D_LINUX
+CFLAGS +=-ISource/Shared -DPIC -fPIC -ISource/MACLib -D__GNUC_IA32__ -DBUILD_CROSS_PLATFORM -D_LINUX
+CXXFLAGS +=-ISource/Shared -DPIC -fPIC -ISource/MACLib -D__GNUC_IA32__ -DBUILD_CROSS_PLATFORM -D_LINUX
ARCH=@ARCH@
xbmc-9.11-maclib.patch:
Prepare.cpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--- NEW FILE xbmc-9.11-maclib.patch ---
diff -Naur xbmc-9.11-11.0/xbmc/cores/paplayer/MACDll/Source/MACLib/Prepare.cpp xbmc-9.11-11.1/xbmc/cores/paplayer/MACDll/Source/MACLib/Prepare.cpp
--- xbmc-9.11-11.0/xbmc/cores/paplayer/MACDll/Source/MACLib/Prepare.cpp 2008-07-15 21:14:31.000000000 +0200
+++ xbmc-9.11-11.1/xbmc/cores/paplayer/MACDll/Source/MACLib/Prepare.cpp 2010-02-03 07:33:21.000000000 +0100
@@ -1,9 +1,9 @@
#include "All.h"
#include "Prepare.h"
-const uint32 CRC32_TABLE[256] = {0,1996959894,3993919788,2567524794,124634137,1886057615,3915621685,2657392035,249268274,2044508324,3772115230,2547177864,162941995,2125561021,3887607047,2428444049,498536548,1789927666,4089016648,2227061214,450548861,1843258603,4107580753,2211677639,325883990,1684777152,4251122042,2321926636,335633487,1661365465,4195302755,2366115317,997073096,1281953886,3579855332,2724688242,1006888145,1258607687,3524101629,2768942443,901097722,1119000684,3686517206,2898065728,853044451,1172266101,3705015759,2882616665,651767980,1373503546,3369554304,3218104598,565507253,1454621731,3485111705,3099436303,671266974,1594198024,3322730930,2970347812,795835527,1483230225,3244367275,3060149565,1994146192,31158534,2563907772,4023717930,1907459465,112637215,2680153253,3904427059,2013776290,251722036,2517215374,3775830040,2137656763,141376813,2439277719,3865271297,1802195444,476864866,2238001368,
- 4066508878,1812370925,453092731,2181625025,4111451223,1706088902,314042704,2344532202,4240017532,1658658271,366619977,2362670323,4224994405,1303535960,984961486,2747007092,3569037538,1256170817,1037604311,2765210733,3554079995,1131014506,879679996,2909243462,3663771856,1141124467,855842277,2852801631,3708648649,1342533948,654459306,3188396048,3373015174,1466479909,544179635,3110523913,3462522015,1591671054,702138776,2966460450,3352799412,1504918807,783551873,3082640443,3233442989,3988292384,2596254646,62317068,1957810842,3939845945,2647816111,81470997,1943803523,3814918930,2489596804,225274430,2053790376,3826175755,2466906013,167816743,2097651377,4027552580,2265490386,503444072,1762050814,4150417245,2154129355,426522225,1852507879,4275313526,2312317920,282753626,1742555852,4189708143,2394877945,397917763,1622183637,3604390888,2714866558,953729732,1340076626,3518719985,2797360999,1068828381,1219638859,3624741850,
- 2936675148,906185462,1090812512,3747672003,2825379669,829329135,1181335161,3412177804,3160834842,628085408,1382605366,3423369109,3138078467,570562233,1426400815,3317316542,2998733608,733239954,1555261956,3268935591,3050360625,752459403,1541320221,2607071920,3965973030,1969922972,40735498,2617837225,3943577151,1913087877,83908371,2512341634,3803740692,2075208622,213261112,2463272603,3855990285,2094854071,198958881,2262029012,4057260610,1759359992,534414190,2176718541,4139329115,1873836001,414664567,2282248934,4279200368,1711684554,285281116,2405801727,4167216745,1634467795,376229701,2685067896,3608007406,1308918612,956543938,2808555105,3495958263,1231636301,1047427035,2932959818,3654703836,1088359270,936918000,2847714899,3736837829,1202900863,817233897,3183342108,3401237130,1404277552,615818150,3134207493,3453421203,1423857449,601450431,3009837614,3294710456,1567103746,711928724,3020668471,3272380065,1510334235,755167117};
+const uint32 CRC32_TABLE[256] = {0U,1996959894U,3993919788U,2567524794U,124634137U,1886057615U,3915621685U,2657392035U,249268274U,2044508324U,3772115230U,2547177864U,162941995U,2125561021U,3887607047U,2428444049U,498536548U,1789927666U,4089016648U,2227061214U,450548861U,1843258603U,4107580753U,2211677639U,325883990U,1684777152U,4251122042U,2321926636U,335633487U,1661365465U,4195302755U,2366115317U,997073096U,1281953886U,3579855332U,2724688242U,1006888145U,1258607687U,3524101629U,2768942443U,901097722U,1119000684U,3686517206U,2898065728U,853044451U,1172266101U,3705015759U,2882616665U,651767980U,1373503546U,3369554304U,3218104598U,565507253U,1454621731U,3485111705U,3099436303U,671266974U,1594198024U,3322730930U,2970347812U,795835527U,1483230225U,3244367275U,3060149565U,1994146192U,31158534U,2563907772U,4023717930U,1907459465U,112637215U,2680153253U,3904427059U,2013776290U,251722036U,2517215374U,3775830040U,2137656763U,141376813U,2439277719U,3865271297U,1802195444U,476864866U,2
238001368U,
+ 4066508878U,1812370925U,453092731U,2181625025U,4111451223U,1706088902U,314042704U,2344532202U,4240017532U,1658658271U,366619977U,2362670323U,4224994405U,1303535960U,984961486U,2747007092U,3569037538U,1256170817U,1037604311U,2765210733U,3554079995U,1131014506U,879679996U,2909243462U,3663771856U,1141124467U,855842277U,2852801631U,3708648649U,1342533948U,654459306U,3188396048U,3373015174U,1466479909U,544179635U,3110523913U,3462522015U,1591671054U,702138776U,2966460450U,3352799412U,1504918807U,783551873U,3082640443U,3233442989U,3988292384U,2596254646U,62317068U,1957810842U,3939845945U,2647816111U,81470997U,1943803523U,3814918930U,2489596804U,225274430U,2053790376U,3826175755U,2466906013U,167816743U,2097651377U,4027552580U,2265490386U,503444072U,1762050814U,4150417245U,2154129355U,426522225U,1852507879U,4275313526U,2312317920U,282753626U,1742555852U,4189708143U,2394877945U,397917763U,1622183637U,3604390888U,2714866558U,953729732U,1340076626U,3518719985U,2797360999U,1068828381
U,1219638859U,3624741850U,
+ 2936675148U,906185462U,1090812512U,3747672003U,2825379669U,829329135U,1181335161U,3412177804U,3160834842U,628085408U,1382605366U,3423369109U,3138078467U,570562233U,1426400815U,3317316542U,2998733608U,733239954U,1555261956U,3268935591U,3050360625U,752459403U,1541320221U,2607071920U,3965973030U,1969922972U,40735498U,2617837225U,3943577151U,1913087877U,83908371U,2512341634U,3803740692U,2075208622U,213261112U,2463272603U,3855990285U,2094854071U,198958881U,2262029012U,4057260610U,1759359992U,534414190U,2176718541U,4139329115U,1873836001U,414664567U,2282248934U,4279200368U,1711684554U,285281116U,2405801727U,4167216745U,1634467795U,376229701U,2685067896U,3608007406U,1308918612U,956543938U,2808555105U,3495958263U,1231636301U,1047427035U,2932959818U,3654703836U,1088359270U,936918000U,2847714899U,3736837829U,1202900863U,817233897U,3183342108U,3401237130U,1404277552U,615818150U,3134207493U,3453421203U,1423857449U,601450431U,3009837614U,3294710456U,1567103746U,711928724U,3020668471U
,3272380065U,1510334235U,755167117U};
int CPrepare::Prepare(const unsigned char * pRawData, int nBytes, const WAVEFORMATEX * pWaveFormatEx, int * pOutputX, int *pOutputY, unsigned int *pCRC, int *pSpecialCodes, int *pPeakLevel)
{
xbmc-9.11-remlibass.patch:
Makefile.in | 6 ------
configure.in | 1 -
2 files changed, 7 deletions(-)
--- NEW FILE xbmc-9.11-remlibass.patch ---
--- xbmc-9.11/configure.in.orig 2010-01-02 18:20:48.334073413 +0100
+++ xbmc-9.11/configure.in 2010-01-02 18:50:21.184073054 +0100
@@ -962,7 +962,6 @@
xbmc/cores/paplayer/WavPackCodec/Makefile \
xbmc/cores/paplayer/YMCodec/StSoundLibrary/Makefile \
guilib/common/Makefile \
- xbmc/lib/libass/xbmc/Makefile \
xbmc/lib/libXBMS/Makefile \
xbmc/lib/libRTV/Makefile \
xbmc/lib/libexif/Makefile \
--- xbmc-9.11/Makefile.in.orig 2010-01-02 17:25:20.723105079 +0100
+++ xbmc-9.11/Makefile.in 2010-01-02 17:25:53.640198700 +0100
@@ -58,9 +58,6 @@
DVDPCODECS_DIRS= \
xbmc/cores/dvdplayer/Codecs \
xbmc/cores/dvdplayer/Codecs/libdvd
-ifneq (@USE_EXTERNAL_LIBASS@,1)
- DVDPCODECS_DIRS+=xbmc/lib/libass/xbmc
-endif
PAPCODECS_DIRS= \
xbmc/cores/paplayer/AC3Codec \
@@ -268,9 +265,6 @@
dvdpcodecs: dllloader
$(MAKE) -C xbmc/cores/dvdplayer/Codecs
$(MAKE) -C xbmc/cores/dvdplayer/Codecs/libdvd
-ifneq (@USE_EXTERNAL_LIBASS@,1)
- $(MAKE) -C xbmc/lib/libass/xbmc
-endif
eventclients:
ifeq ($(findstring osx,$(ARCH)), osx)
$(MAKE) -C tools/EventClients/Clients/OSXRemote
xbmc-9.11-remove-goahead.patch:
Makefile.in | 7 +------
configure.in | 1 -
guilib/system.h | 2 +-
3 files changed, 2 insertions(+), 8 deletions(-)
--- NEW FILE xbmc-9.11-remove-goahead.patch ---
--- configure.in.orig 2010-03-06 04:48:49.233198314 -0500
+++ configure.in 2010-03-06 04:51:02.297020657 -0500
@@ -990,7 +990,6 @@
xbmc/lib/libexif/Makefile \
xbmc/lib/libXDAAP/Makefile \
xbmc/lib/libhdhomerun/Makefile \
- xbmc/lib/libGoAhead/Makefile \
xbmc/lib/libshout/Makefile \
xbmc/lib/libsquish/Makefile \
xbmc/lib/libid3tag/Makefile \
--- Makefile.in.orig 2010-03-06 04:49:38.948896140 -0500
+++ Makefile.in 2010-03-06 04:50:24.628895410 -0500
@@ -29,7 +29,6 @@
xbmc/karaoke \
xbmc/lib/libcmyth \
xbmc/lib/libhts \
- xbmc/lib/libGoAhead \
xbmc/lib/libPython \
xbmc/lib/libPython/xbmcmodule \
xbmc/lib/libRTMP \
@@ -219,8 +218,6 @@
$(MAKE) -C xbmc/lib/libXBMS
xbmc/lib/libXDAAP/libxdaap-@ARCH@.a: force
$(MAKE) -C xbmc/lib/libXDAAP
-xbmc/lib/libGoAhead/libGoAhead-@ARCH@.a: force
- $(MAKE) -C xbmc/lib/libGoAhead
xbmc/lib/sqLite/sqllite.a: force
$(MAKE) -C xbmc/lib/sqLite
xbmc/lib/UnrarXLib/UnrarXLib.a: force
@@ -315,8 +312,7 @@
xbmc/lib/libXBMS/libxbms-@ARCH@.a \
xbmc/lib/libRTV/librtv-@ARCH@.a \
xbmc/lib/libXDAAP/libxdaap-@ARCH@.a \
- xbmc/lib/libshout/libshout-@ARCH@.a \
- xbmc/lib/libGoAhead/libGoAhead-@ARCH@.a
+ xbmc/lib/libshout/libshout-@ARCH@.a
# platform independend objects
OBJSXBMC= \
@@ -355,7 +351,6 @@
xbmc/lib/libUPnP/libupnp-@ARCH@.a \
xbmc/lib/libXBMS/libxbms-@ARCH@.a \
xbmc/lib/libXDAAP/libxdaap-@ARCH@.a \
- xbmc/lib/libGoAhead/libGoAhead-@ARCH@.a \
xbmc/lib/sqLite/sqllite.a \
xbmc/lib/libsquish/libsquish-@ARCH@.a \
xbmc/screensavers/screensaver.a \
--- guilib/system.h.orig 2010-03-06 05:42:46.227020727 -0500
+++ guilib/system.h 2010-03-06 05:44:35.429895860 -0500
@@ -44,7 +44,7 @@
#define HAS_UPNP
#define HAS_VIDEO_PLAYBACK
#define HAS_VISUALISATION
-#define HAS_WEB_SERVER
+/* undef HAS_WEB_SERVER */
#define HAS_AC3_CODEC
#define HAS_DTS_CODEC
xbmc-9.11-rsxs-0.9.diff:
configure.in | 6 ++++--
xbmc/screensavers/rsxs-0.9/configure | 8 ++++----
xbmc/screensavers/rsxs-0.9/configure.ac | 8 ++++----
xbmc/screensavers/rsxs-0.9/src/Makefile.common | 2 +-
xbmc/screensavers/rsxs-0.9/src/cyclone/Makefile.in | 2 +-
xbmc/screensavers/rsxs-0.9/src/euphoria/Makefile.in | 2 +-
xbmc/screensavers/rsxs-0.9/src/fieldlines/Makefile.in | 2 +-
xbmc/screensavers/rsxs-0.9/src/flocks/Makefile.in | 2 +-
xbmc/screensavers/rsxs-0.9/src/flux/Makefile.in | 2 +-
xbmc/screensavers/rsxs-0.9/src/helios/Makefile.in | 2 +-
xbmc/screensavers/rsxs-0.9/src/hyperspace/Makefile.in | 2 +-
xbmc/screensavers/rsxs-0.9/src/lattice/Makefile.in | 2 +-
xbmc/screensavers/rsxs-0.9/src/plasma/Makefile.in | 2 +-
xbmc/screensavers/rsxs-0.9/src/skyrocket/Makefile.in | 2 +-
xbmc/screensavers/rsxs-0.9/src/solarwinds/Makefile.in | 2 +-
15 files changed, 24 insertions(+), 22 deletions(-)
--- NEW FILE xbmc-9.11-rsxs-0.9.diff ---
diff -Naur xbmc-9.11-8.3/configure.in xbmc-9.11-8.4/configure.in
--- xbmc-9.11-8.3/configure.in 2010-01-22 11:06:37.000000000 +0100
+++ xbmc-9.11-8.4/configure.in 2010-01-24 06:05:15.000000000 +0100
@@ -1363,8 +1363,10 @@
--disable-skyrocket
else
./configure \
- CFLAGS="-fPIC" \
- CXXFLAGS="-fPIC" \
+ CPPFLAGS="$CPPFLAGS" \
+ CFLAGS="$CFLAGS -fPIC" \
+ CXXFLAGS="$CXXFLAGS -fPIC" \
+ --prefix="${prefix}" --includedir="${includedir}" --libdir="${libdir}" --datadir="${datadir}" \
--without-xscreensaver \
--disable-sound \
--disable-cyclone \
diff -Naur xbmc-9.11-8.3/xbmc/screensavers/rsxs-0.9/configure xbmc-9.11-8.4/xbmc/screensavers/rsxs-0.9/configure
--- xbmc-9.11-8.3/xbmc/screensavers/rsxs-0.9/configure 2008-07-20 17:54:35.000000000 +0200
+++ xbmc-9.11-8.4/xbmc/screensavers/rsxs-0.9/configure 2010-01-24 06:03:38.000000000 +0100
@@ -3241,7 +3241,7 @@
fi
-CXXFLAGS=`echo $CXXFLAGS | sed -e s,-O2,-O3,`
+#CXXFLAGS=`echo $CXXFLAGS | sed -e s,-O2,-O3,`
ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -3469,9 +3469,9 @@
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-if test x"$GXX" = x"yes"; then
- CXXFLAGS=`echo $CXXFLAGS -Wall`
-fi
+#if test x"$GXX" = x"yes"; then
+# CXXFLAGS=`echo $CXXFLAGS -Wall`
+#fi
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
diff -Naur xbmc-9.11-8.3/xbmc/screensavers/rsxs-0.9/configure.ac xbmc-9.11-8.4/xbmc/screensavers/rsxs-0.9/configure.ac
--- xbmc-9.11-8.3/xbmc/screensavers/rsxs-0.9/configure.ac 2007-10-08 19:37:14.000000000 +0200
+++ xbmc-9.11-8.4/xbmc/screensavers/rsxs-0.9/configure.ac 2010-01-24 06:03:38.000000000 +0100
@@ -16,12 +16,12 @@
LT_AC_PROG_SED
AC_LANG(C++)
AC_PROG_CXX
-CXXFLAGS=`echo $CXXFLAGS | sed -e s,-O2,-O3,`
+#CXXFLAGS=`echo $CXXFLAGS | sed -e s,-O2,-O3,`
AC_PROG_CXXCPP
-if test x"$GXX" = x"yes"; then
- CXXFLAGS=`echo $CXXFLAGS -Wall`
-fi
+#if test x"$GXX" = x"yes"; then
+# CXXFLAGS=`echo $CXXFLAGS -Wall`
+#fi
AC_PROG_CC
AM_PROG_CC_C_O
diff -Naur xbmc-9.11-8.3/xbmc/screensavers/rsxs-0.9/src/cyclone/Makefile.in xbmc-9.11-8.4/xbmc/screensavers/rsxs-0.9/src/cyclone/Makefile.in
--- xbmc-9.11-8.3/xbmc/screensavers/rsxs-0.9/src/cyclone/Makefile.in 2009-01-24 23:51:01.000000000 +0100
+++ xbmc-9.11-8.4/xbmc/screensavers/rsxs-0.9/src/cyclone/Makefile.in 2010-01-24 06:03:38.000000000 +0100
@@ -278,7 +278,7 @@
@DLOPEN_TRUE@LIBLTDL_CPPFLAGS = -I$(top_builddir)/libltdl
AM_CPPFLAGS = -DPKGDATADIR=\"$(pkgdatadir)\" -I$(srcdir)/.. -I$(top_srcdir)/lib $(X_CPPFLAGS)
AM_LDFLAGS =
-AM_CXXFLAGS = -Wall -funroll-loops
+AM_CXXFLAGS =
AM_ETAGSFLAGS = --extra=fq
rs_cyclone_SOURCES = $(COMMON) $(COLOR) $(VECTOR) blend.cc blend.hh cyclone.cc \
cyclone.hh particle.cc particle.hh
diff -Naur xbmc-9.11-8.3/xbmc/screensavers/rsxs-0.9/src/euphoria/Makefile.in xbmc-9.11-8.4/xbmc/screensavers/rsxs-0.9/src/euphoria/Makefile.in
--- xbmc-9.11-8.3/xbmc/screensavers/rsxs-0.9/src/euphoria/Makefile.in 2009-01-24 23:51:01.000000000 +0100
+++ xbmc-9.11-8.4/xbmc/screensavers/rsxs-0.9/src/euphoria/Makefile.in 2010-01-24 06:03:38.000000000 +0100
@@ -290,7 +290,7 @@
AM_CPPFLAGS = -DPKGDATADIR=\"$(pkgdatadir)\" -I$(srcdir)/.. \
-I$(top_srcdir)/lib $(X_CPPFLAGS) $(IMAGE_CPPFLAGS)
AM_LDFLAGS = $(IMAGE_LDFLAGS)
-AM_CXXFLAGS = -Wall -funroll-loops $(IMAGE_CXXFLAGS)
+AM_CXXFLAGS = $(IMAGE_CXXFLAGS)
AM_ETAGSFLAGS = --extra=fq
rs_euphoria_SOURCES = $(COMMON) $(COLOR) $(VECTOR) $(IMAGE) euphoria.cc \
euphoria.hh wisp.cc wisp.hh
diff -Naur xbmc-9.11-8.3/xbmc/screensavers/rsxs-0.9/src/fieldlines/Makefile.in xbmc-9.11-8.4/xbmc/screensavers/rsxs-0.9/src/fieldlines/Makefile.in
--- xbmc-9.11-8.3/xbmc/screensavers/rsxs-0.9/src/fieldlines/Makefile.in 2009-01-24 23:51:01.000000000 +0100
+++ xbmc-9.11-8.4/xbmc/screensavers/rsxs-0.9/src/fieldlines/Makefile.in 2010-01-24 06:03:38.000000000 +0100
@@ -277,7 +277,7 @@
@DLOPEN_TRUE@LIBLTDL_CPPFLAGS = -I$(top_builddir)/libltdl
AM_CPPFLAGS = -DPKGDATADIR=\"$(pkgdatadir)\" -I$(srcdir)/.. -I$(top_srcdir)/lib $(X_CPPFLAGS)
AM_LDFLAGS =
-AM_CXXFLAGS = -Wall -funroll-loops
+AM_CXXFLAGS =
AM_ETAGSFLAGS = --extra=fq
rs_fieldlines_SOURCES = $(COMMON) $(COLOR) $(VECTOR) fieldlines.cc \
fieldlines.hh ion.hh
diff -Naur xbmc-9.11-8.3/xbmc/screensavers/rsxs-0.9/src/flocks/Makefile.in xbmc-9.11-8.4/xbmc/screensavers/rsxs-0.9/src/flocks/Makefile.in
--- xbmc-9.11-8.3/xbmc/screensavers/rsxs-0.9/src/flocks/Makefile.in 2009-01-24 23:51:01.000000000 +0100
+++ xbmc-9.11-8.4/xbmc/screensavers/rsxs-0.9/src/flocks/Makefile.in 2010-01-24 06:03:38.000000000 +0100
@@ -277,7 +277,7 @@
@DLOPEN_TRUE@LIBLTDL_CPPFLAGS = -I$(top_builddir)/libltdl
AM_CPPFLAGS = -DPKGDATADIR=\"$(pkgdatadir)\" -I$(srcdir)/.. -I$(top_srcdir)/lib $(X_CPPFLAGS)
AM_LDFLAGS =
-AM_CXXFLAGS = -Wall -funroll-loops
+AM_CXXFLAGS =
AM_ETAGSFLAGS = --extra=fq
rs_flocks_SOURCES = $(COMMON) $(COLOR) $(VECTOR) bug.cc bug.hh flocks.cc \
flocks.hh
diff -Naur xbmc-9.11-8.3/xbmc/screensavers/rsxs-0.9/src/flux/Makefile.in xbmc-9.11-8.4/xbmc/screensavers/rsxs-0.9/src/flux/Makefile.in
--- xbmc-9.11-8.3/xbmc/screensavers/rsxs-0.9/src/flux/Makefile.in 2009-01-24 23:51:01.000000000 +0100
+++ xbmc-9.11-8.4/xbmc/screensavers/rsxs-0.9/src/flux/Makefile.in 2010-01-24 06:03:38.000000000 +0100
@@ -277,7 +277,7 @@
@DLOPEN_TRUE@LIBLTDL_CPPFLAGS = -I$(top_builddir)/libltdl
AM_CPPFLAGS = -DPKGDATADIR=\"$(pkgdatadir)\" -I$(srcdir)/.. -I$(top_srcdir)/lib $(X_CPPFLAGS)
AM_LDFLAGS =
-AM_CXXFLAGS = -Wall -funroll-loops
+AM_CXXFLAGS =
AM_ETAGSFLAGS = --extra=fq
rs_flux_SOURCES = $(COMMON) $(COLOR) $(VECTOR) flux.cc flux.hh trail.cc trail.hh
rs_flux_LDADD = $(LIBMISC) $(X_LIBS) $(OPENGL_LIBS)
diff -Naur xbmc-9.11-8.3/xbmc/screensavers/rsxs-0.9/src/helios/Makefile.in xbmc-9.11-8.4/xbmc/screensavers/rsxs-0.9/src/helios/Makefile.in
--- xbmc-9.11-8.3/xbmc/screensavers/rsxs-0.9/src/helios/Makefile.in 2009-01-24 23:51:01.000000000 +0100
+++ xbmc-9.11-8.4/xbmc/screensavers/rsxs-0.9/src/helios/Makefile.in 2010-01-24 06:03:38.000000000 +0100
@@ -290,7 +290,7 @@
AM_CPPFLAGS = -DPKGDATADIR=\"$(pkgdatadir)\" -I$(srcdir)/.. \
-I$(top_srcdir)/lib $(X_CPPFLAGS) $(IMAGE_CPPFLAGS)
AM_LDFLAGS = $(IMAGE_LDFLAGS)
-AM_CXXFLAGS = -Wall -funroll-loops $(IMAGE_CXXFLAGS)
+AM_CXXFLAGS = $(IMAGE_CXXFLAGS)
AM_ETAGSFLAGS = --extra=fq
rs_helios_SOURCES = $(COMMON) $(COLOR) $(VECTOR) $(IMAGE) $(IMPLICIT) \
helios.cc helios.hh particle.cc particle.hh sphere.hh
diff -Naur xbmc-9.11-8.3/xbmc/screensavers/rsxs-0.9/src/hyperspace/Makefile.in xbmc-9.11-8.4/xbmc/screensavers/rsxs-0.9/src/hyperspace/Makefile.in
--- xbmc-9.11-8.3/xbmc/screensavers/rsxs-0.9/src/hyperspace/Makefile.in 2009-01-24 23:51:01.000000000 +0100
+++ xbmc-9.11-8.4/xbmc/screensavers/rsxs-0.9/src/hyperspace/Makefile.in 2010-01-24 06:03:38.000000000 +0100
@@ -295,7 +295,7 @@
AM_CPPFLAGS = -DPKGDATADIR=\"$(pkgdatadir)\" -I$(srcdir)/.. \
-I$(top_srcdir)/lib $(X_CPPFLAGS) $(IMAGE_CPPFLAGS)
AM_LDFLAGS = $(IMAGE_LDFLAGS)
-AM_CXXFLAGS = -Wall -funroll-loops $(IMAGE_CXXFLAGS)
+AM_CXXFLAGS = $(IMAGE_CXXFLAGS)
AM_ETAGSFLAGS = --extra=fq
rs_hyperspace_SOURCES = $(COMMON) $(COLOR) $(VECTOR) $(IMPLICIT) $(IMAGE) \
caustic.cc caustic.hh cubemaps.cc cubemaps.hh extensions.cc extensions.hh \
diff -Naur xbmc-9.11-8.3/xbmc/screensavers/rsxs-0.9/src/lattice/Makefile.in xbmc-9.11-8.4/xbmc/screensavers/rsxs-0.9/src/lattice/Makefile.in
--- xbmc-9.11-8.3/xbmc/screensavers/rsxs-0.9/src/lattice/Makefile.in 2009-01-24 23:51:01.000000000 +0100
+++ xbmc-9.11-8.4/xbmc/screensavers/rsxs-0.9/src/lattice/Makefile.in 2010-01-24 06:03:38.000000000 +0100
@@ -287,7 +287,7 @@
AM_CPPFLAGS = -DPKGDATADIR=\"$(pkgdatadir)\" -I$(srcdir)/.. \
-I$(top_srcdir)/lib $(X_CPPFLAGS) $(IMAGE_CPPFLAGS)
AM_LDFLAGS = $(IMAGE_LDFLAGS)
-AM_CXXFLAGS = -Wall -funroll-loops $(IMAGE_CXXFLAGS)
+AM_CXXFLAGS = $(IMAGE_CXXFLAGS)
AM_ETAGSFLAGS = --extra=fq
rs_lattice_SOURCES = $(COMMON) $(VECTOR) $(IMAGE) camera.hh lattice.cc \
lattice.hh resources.cc resources.hh
diff -Naur xbmc-9.11-8.3/xbmc/screensavers/rsxs-0.9/src/Makefile.common xbmc-9.11-8.4/xbmc/screensavers/rsxs-0.9/src/Makefile.common
--- xbmc-9.11-8.3/xbmc/screensavers/rsxs-0.9/src/Makefile.common 2007-10-08 19:37:14.000000000 +0200
+++ xbmc-9.11-8.4/xbmc/screensavers/rsxs-0.9/src/Makefile.common 2010-01-24 06:03:38.000000000 +0100
@@ -18,7 +18,7 @@
AM_CPPFLAGS = -DPKGDATADIR=\"$(pkgdatadir)\" -I$(srcdir)/.. -I$(top_srcdir)/lib $(X_CPPFLAGS) -D_LINUX -DXBMC
AM_LDFLAGS =
-AM_CXXFLAGS = -Wall -funroll-loops
+AM_CXXFLAGS =
AM_ETAGSFLAGS = --extra=fq
diff -Naur xbmc-9.11-8.3/xbmc/screensavers/rsxs-0.9/src/plasma/Makefile.in xbmc-9.11-8.4/xbmc/screensavers/rsxs-0.9/src/plasma/Makefile.in
--- xbmc-9.11-8.3/xbmc/screensavers/rsxs-0.9/src/plasma/Makefile.in 2009-01-24 23:51:01.000000000 +0100
+++ xbmc-9.11-8.4/xbmc/screensavers/rsxs-0.9/src/plasma/Makefile.in 2010-01-24 06:03:38.000000000 +0100
@@ -274,7 +274,7 @@
@DLOPEN_TRUE@LIBLTDL_CPPFLAGS = -I$(top_builddir)/libltdl
AM_CPPFLAGS = -DPKGDATADIR=\"$(pkgdatadir)\" -I$(srcdir)/.. -I$(top_srcdir)/lib $(X_CPPFLAGS)
AM_LDFLAGS =
-AM_CXXFLAGS = -Wall -funroll-loops
+AM_CXXFLAGS =
AM_ETAGSFLAGS = --extra=fq
rs_plasma_SOURCES = $(COMMON) plasma.cc plasma.hh
rs_plasma_LDADD = $(LIBMISC) $(X_LIBS) $(OPENGL_LIBS)
diff -Naur xbmc-9.11-8.3/xbmc/screensavers/rsxs-0.9/src/skyrocket/Makefile.in xbmc-9.11-8.4/xbmc/screensavers/rsxs-0.9/src/skyrocket/Makefile.in
--- xbmc-9.11-8.3/xbmc/screensavers/rsxs-0.9/src/skyrocket/Makefile.in 2009-01-24 23:51:01.000000000 +0100
+++ xbmc-9.11-8.4/xbmc/screensavers/rsxs-0.9/src/skyrocket/Makefile.in 2010-01-24 06:03:38.000000000 +0100
@@ -310,7 +310,7 @@
-I$(top_srcdir)/lib $(X_CPPFLAGS) $(LIBLTDL_CPPFLAGS) \
$(IMAGE_CPPFLAGS) $(SOUND_CPPFLAGS)
AM_LDFLAGS = $(IMAGE_LDFLAGS) $(SOUND_LDFLAGS)
-AM_CXXFLAGS = -Wall -funroll-loops $(IMAGE_CXXFLAGS) $(SOUND_CXXFLAGS)
+AM_CXXFLAGS = $(IMAGE_CXXFLAGS) $(SOUND_CXXFLAGS)
AM_ETAGSFLAGS = --extra=fq
rs_skyrocket_SOURCES = $(COMMON) $(COLOR) $(VECTOR) $(IMAGE) $(SOUND) $(DLOPEN) \
bee.cc bee.hh bigmama.cc bigmama.hh bomb.cc bomb.hh explosion.cc \
diff -Naur xbmc-9.11-8.3/xbmc/screensavers/rsxs-0.9/src/solarwinds/Makefile.in xbmc-9.11-8.4/xbmc/screensavers/rsxs-0.9/src/solarwinds/Makefile.in
--- xbmc-9.11-8.3/xbmc/screensavers/rsxs-0.9/src/solarwinds/Makefile.in 2009-01-24 23:51:01.000000000 +0100
+++ xbmc-9.11-8.4/xbmc/screensavers/rsxs-0.9/src/solarwinds/Makefile.in 2010-01-24 06:03:38.000000000 +0100
@@ -277,7 +277,7 @@
@DLOPEN_TRUE@LIBLTDL_CPPFLAGS = -I$(top_builddir)/libltdl
AM_CPPFLAGS = -DPKGDATADIR=\"$(pkgdatadir)\" -I$(srcdir)/.. -I$(top_srcdir)/lib $(X_CPPFLAGS)
AM_LDFLAGS =
-AM_CXXFLAGS = -Wall -funroll-loops
+AM_CXXFLAGS =
AM_ETAGSFLAGS = --extra=fq
rs_solarwinds_SOURCES = $(COMMON) $(COLOR) $(VECTOR) solarwinds.cc \
solarwinds.hh wind.cc wind.hh
xbmc-9.11-spyce.diff:
spyce.py | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
--- NEW FILE xbmc-9.11-spyce.diff ---
diff -Naur xbmc-9.11.orig/system/python/spyce/spyce.py xbmc-9.11/system/python/spyce/spyce.py
--- xbmc-9.11.orig/system/python/spyce/spyce.py 2008-12-31 05:41:27.000000000 +0100
+++ xbmc-9.11/system/python/spyce/spyce.py 2009-12-30 09:16:24.000000000 +0100
@@ -415,18 +415,18 @@
self._response = self._request = None
self._responseCallback = {}
self._moduleCallback = {}
- def _startModule(self, name, file=None, as=None, force=0):
+ def _startModule(self, name, file=None, name_as=None, force=0):
"Initialise module for current request."
- if as==None: as=name
- if force or not self._codeenv.has_key(as):
+ if name_as==None: name_as=name
+ if force or not self._codeenv.has_key(name_as):
modclass = getServer().loadModule(name, file, self._spycecode.getFilename())
mod = modclass(self._api)
- self.setModule(as, mod, 0)
+ self.setModule(name_as, mod, 0)
if DEBUG_ERROR:
- sys.stderr.write(as+'.start\n')
+ sys.stderr.write(name_as+'.start\n')
mod.start()
- self._modstarted.append((as, mod))
- else: mod = self._codeenv[as]
+ self._modstarted.append((name_as, mod))
+ else: mod = self._codeenv[name_as]
return mod
# spyce processing
def spyceInit(self, request, response):
@@ -459,10 +459,10 @@
exec '_spyce_finish()' in { '_spyce_finish': self.destroy }
# explicit modules
self._modstarted.reverse()
- for as, mod in self._modstarted:
+ for name_as, mod in self._modstarted:
try:
if DEBUG_ERROR:
- sys.stderr.write(as+'.finish\n')
+ sys.stderr.write(name_as+'.finish\n')
mod.finish(theError)
except spyceException.spyceDone: pass
except spyceException.spyceRedirect, e:
@@ -473,10 +473,10 @@
finishError = None
# default modules
self._modstarteddefault.reverse()
- for as, mod in self._modstarteddefault:
+ for name_as, mod in self._modstarteddefault:
try:
if DEBUG_ERROR:
- sys.stderr.write(as+'.finish\n')
+ sys.stderr.write(name_as+'.finish\n')
mod.finish(theError)
except: finishError = 1
self._request = None
xbmc-9.11-swscale.diff:
DllSwScale.h | 4 ++++
1 file changed, 4 insertions(+)
--- NEW FILE xbmc-9.11-swscale.diff ---
--- xbmc-9.11.orig/xbmc/cores/ffmpeg/DllSwScale.h 2009-09-15 12:19:19.000000000 +0200
+++ xbmc-9.11/xbmc/cores/ffmpeg/DllSwScale.h 2010-03-02 16:55:15.101967249 +0100
@@ -76,7 +76,11 @@
virtual int sws_scale(struct SwsContext *context, uint8_t* src[], int srcStride[], int srcSliceY,
int srcSliceH, uint8_t* dst[], int dstStride[])
+#if LIBSWSCALE_VERSION_INT >= 0x800
+ { return ::sws_scale(context, const_cast<const uint8_t**>(src), srcStride, srcSliceY, srcSliceH, dst, dstStride); }
+#else
{ return ::sws_scale(context, src, srcStride, srcSliceY, srcSliceH, dst, dstStride); }
+#endif
#if (! defined USE_EXTERNAL_FFMPEG)
virtual void sws_rgb2rgb_init(int flags) { ::sws_rgb2rgb_init(flags); }
#elif (defined HAVE_LIBSWSCALE_RGB2RGB_H) || (defined HAVE_FFMPEG_RGB2RGB_H)
xbmc-9.11-use_cdio_system_headers_on_non_win32.patch:
b/xbmc/Application.cpp | 4 ++++
b/xbmc/FileSystem/cdioSupport.cpp | 2 +-
b/xbmc/FileSystem/iso9660.cpp | 2 +-
b/xbmc/Makefile | 2 --
b/xbmc/cdrip/CDDAReader.cpp | 4 ++++
b/xbmc/cores/paplayer/AC3CDDACodec.cpp | 4 ++++
b/xbmc/cores/paplayer/CDDAcodec.cpp | 4 ++++
b/xbmc/cores/paplayer/DTSCDDACodec.cpp | 4 ++++
xbmc-9.11/xbmc/FileSystem/Makefile | 1 -
9 files changed, 22 insertions(+), 5 deletions(-)
--- NEW FILE xbmc-9.11-use_cdio_system_headers_on_non_win32.patch ---
--- xbmc-9.11/xbmc/FileSystem/Makefile.orig 2009-10-10 15:00:16.000000000 +0200
+++ xbmc-9.11/xbmc/FileSystem/Makefile 2009-12-29 14:42:11.568652874 +0100
@@ -1,5 +1,4 @@
INCLUDES=-I. -I../ -I../cores -I../linux -I../../guilib -I../lib/UnrarXLib -I../utils -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include
-INCLUDES+=-I../lib/libcdio/libcdio/include
CXXFLAGS+=-D__STDC_FORMAT_MACROS \
diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp
index 9097519..9b6418d 100644
--- a/xbmc/Application.cpp
+++ b/xbmc/Application.cpp
@@ -236,7 +236,11 @@
#endif
#ifdef HAS_DVD_DRIVE
+#ifdef _WIN32
#include "lib/libcdio/logging.h"
+#else
+#include <cdio/logging.h>
+#endif
#endif
#ifdef HAS_HAL
diff --git a/xbmc/FileSystem/cdioSupport.cpp b/xbmc/FileSystem/cdioSupport.cpp
index 00e5fdd..21a0b67 100644
--- a/xbmc/FileSystem/cdioSupport.cpp
+++ b/xbmc/FileSystem/cdioSupport.cpp
@@ -26,7 +26,7 @@
#include "cdioSupport.h"
#include "utils/SingleLock.h"
#include "utils/log.h"
-#ifndef _LINUX
+#ifdef _WIN32
#include "lib/libcdio/logging.h"
#include "lib/libcdio/util.h"
#include "lib/libcdio/mmc.h"
diff --git a/xbmc/FileSystem/iso9660.cpp b/xbmc/FileSystem/iso9660.cpp
index 6e1633f..58fbc50 100644
--- a/xbmc/FileSystem/iso9660.cpp
+++ b/xbmc/FileSystem/iso9660.cpp
@@ -44,7 +44,7 @@ ISO9660
#include "utils/CharsetConverter.h"
#include "DetectDVDType.h" // for MODE2_DATA_SIZE etc.
-#ifdef _LINUX
+#ifndef _WIN32
#include <cdio/bytesex.h>
#else
#include "lib/libcdio/bytesex.h" // for from_723 & from_733
diff --git a/xbmc/Makefile b/xbmc/Makefile
index abfbdcb..f55381a 100644
--- a/xbmc/Makefile
+++ b/xbmc/Makefile
@@ -8,8 +8,6 @@ INCLUDES+=-Ilib/libUPnP/Platinum/Source/Core \
-Ilib/libUPnP/Neptune/Source/System/Posix \
-Ilib/libUPnP/Neptune/Source/Core
-INCLUDES+=-Ilib/libcdio/libcdio/include
-
SRCS=Application.cpp \
CueDocument.cpp \
GUISettings.cpp \
diff --git a/xbmc/cdrip/CDDAReader.cpp b/xbmc/cdrip/CDDAReader.cpp
index c8b37b2..e3e9c0b 100644
--- a/xbmc/cdrip/CDDAReader.cpp
+++ b/xbmc/cdrip/CDDAReader.cpp
@@ -24,7 +24,11 @@
#ifdef HAS_CDDA_RIPPER
#include "CDDAReader.h"
+#ifdef _WIN32
#include "lib/libcdio/cdio.h"
+#else
+#include <cdio/cdio.h>
+#endif
#include "utils/log.h"
#define SECTOR_COUNT 52
diff --git a/xbmc/cores/paplayer/AC3CDDACodec.cpp b/xbmc/cores/paplayer/AC3CDDACodec.cpp
index 20cded7..f2a077a 100644
--- a/xbmc/cores/paplayer/AC3CDDACodec.cpp
+++ b/xbmc/cores/paplayer/AC3CDDACodec.cpp
@@ -22,7 +22,11 @@
#include "system.h"
#include "AC3CDDACodec.h"
#ifdef HAS_AC3_CDDA_CODEC
+#ifdef _WIN32
#include "lib/libcdio/sector.h"
+#else
+#include <cdio/sector.h>
+#endif
AC3CDDACodec::AC3CDDACodec() : AC3Codec()
{
diff --git a/xbmc/cores/paplayer/CDDAcodec.cpp b/xbmc/cores/paplayer/CDDAcodec.cpp
index ca8f1be..42460dc 100644
--- a/xbmc/cores/paplayer/CDDAcodec.cpp
+++ b/xbmc/cores/paplayer/CDDAcodec.cpp
@@ -20,7 +20,11 @@
*/
#include "CDDAcodec.h"
+#ifdef _WIN32
#include "lib/libcdio/sector.h"
+#else
+#include <cdio/sector.h>
+#endif
#define SECTOR_COUNT 55 // max. sectors that can be read at once
#define MAX_BUFFER_SIZE 2*SECTOR_COUNT*CDIO_CD_FRAMESIZE_RAW
diff --git a/xbmc/cores/paplayer/DTSCDDACodec.cpp b/xbmc/cores/paplayer/DTSCDDACodec.cpp
index e64cc2e..9bc46c6 100644
--- a/xbmc/cores/paplayer/DTSCDDACodec.cpp
+++ b/xbmc/cores/paplayer/DTSCDDACodec.cpp
@@ -22,7 +22,11 @@
#include "system.h"
#include "DTSCDDACodec.h"
#ifdef HAS_DTS_CODEC
+#ifdef _WIN32
#include "lib/libcdio/sector.h"
+#else
+#include <cdio/sector.h>
+#endif
DTSCDDACodec::DTSCDDACodec() : DTSCodec()
{
xbmc-9.11-xbmc.sh.diff:
xbmc.sh.in | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
--- NEW FILE xbmc-9.11-xbmc.sh.diff ---
--- xbmc-9.11.orig/tools/Linux/xbmc.sh.in 2009-12-06 11:44:24.000000000 +0100
+++ xbmc-9.11/tools/Linux/xbmc.sh.in 2010-01-20 17:26:39.000000000 +0100
@@ -5,7 +5,7 @@
find $1 -maxdepth $2 -name 'core*' -exec \
echo "=====> Core file: {}" 2> /dev/null >> $FILE \; -exec \
echo " ========================================= " 2> /dev/null >> $FILE \; -exec \
- gdb /usr/share/xbmc/xbmc.bin --core={} --batch -ex "thread apply all bt" 2> /dev/null >> $FILE \; -exec \
+ /usr/bin/gdb @libdir(a)/xbmc/xbmc.bin --core={} --batch -ex "thread apply all bt" 2> /dev/null >> $FILE \; -exec \
rm -f {} \;
}
@@ -37,7 +37,7 @@
if [ $XBMC_HOME ]; then
BASEDIR=$XBMC_HOME
else
- BASEDIR=@prefix@/share/xbmc/
+ BASEDIR=@libdir@/xbmc/
fi
single_stacktrace $BASEDIR 5
# find in user xbmc dir
@@ -63,11 +63,13 @@
}
# Set XBMC_HOME if xbmc.bin is a symlink
-if [ -L @prefix(a)/share/xbmc/xbmc.bin ]; then
- export XBMC_HOME="@prefix@/share/xbmc"
+if [ -L @libdir(a)/xbmc/xbmc.bin ]; then
+ export XBMC_HOME="@libdir@/xbmc"
fi
-python @prefix(a)/share/xbmc/FEH.py "$@"
+# export XBMC_HOME=@libdir@/xbmc
+
+python @libdir(a)/xbmc/FEH.py "$@"
if [ $? -ne 0 ]; then
exit
fi
@@ -76,7 +78,7 @@
while (( $LOOP ))
do
LOOP=0
- @prefix(a)/share/xbmc/xbmc.bin "$@"
+ @libdir(a)/xbmc/xbmc.bin "$@"
RET=$?
if (( $RET == 65 ))
then
xbmc-9.11-xext.diff:
configure.in | 3 +++
1 file changed, 3 insertions(+)
--- NEW FILE xbmc-9.11-xext.diff ---
--- xbmc-9.11.orig/configure.in 2010-03-02 04:27:24.000000000 +0100
+++ xbmc-9.11/configure.in 2010-03-02 17:00:29.000000000 +0100
@@ -402,6 +402,9 @@
PKG_CHECK_MODULES([XT], [xt],
[INCLUDES+=" $XT_CFLAGS"; LIBS+=" $XT_LIBS"],
AC_MSG_ERROR($missing_library))
+ PKG_CHECK_MODULES([XEXT], [xext],
+ [INCLUDES+=" $XEXT_CFLAGS"; LIBS+=" $XEXT_LIBS"],
+ AC_MSG_ERROR($missing_library))
PKG_CHECK_MODULES([XTST], [xtst],
[INCLUDES+=" $XTST_CFLAGS"; LIBS+=" $XTST_LIBS"],
AC_MSG_ERROR($missing_library))
--- NEW FILE xbmc-generate-tarball-xz.sh ---
#!/bin/sh
VERSION=${1-9.11}
tar -xzvf xbmc-$VERSION.tar.gz
cd xbmc-$VERSION
# remove bundled libraries (including zlib and OSX), saves space and forces using external versions
# also remove legally problematic libGoAhead library
for i in libass libcdio libCDRip libcurl libenca libfribidi liblzo libmms libpcre libsamplerate sqLite/sqlite libPython/Python cximage-6.0/zlib libid3tag/zlib zlib libSDL-OSX boost libportaudio libglew libGoAhead libhdhomerun
do
rm -r xbmc/lib/$i
done
# bundled win32 binaries
rm -r xbmc/visualizations/XBMCProjectM/win32
# remove various headers
rm xbmc/FileSystem/zlib.h
# remove more bundled codecs
# libfaad2, libmad needs upstream patches to be able to remove from tarball
# even though the bundled libaries aren't, I think, compiled
for i in ffmpeg liba52 libmpeg2 libdts
do
rm -r xbmc/cores/dvdplayer/Codecs/$i
done
# remove DVD stuff we can't ship, or is already in external libraries
for i in libdvdcss libdvdread includes
do
rm -r xbmc/cores/dvdplayer/Codecs/libdvd/$i
done
# remove all prebuilt binaries (e.g., .so files and Win32 DLLs)
find \( -name '*.so' -o -name '*.DLL' -o -name '*.dll' -o -name '*.lib' -o -name '*.zlib' -o -name '*.obj' -o -name '*.exe' -o -name '*.vis' \) | xargs rm -f
# remove other packages that should be system-wide
rm -rf lib
cd -
# repack
tar -cJvf xbmc-$VERSION-patched.tar.xz xbmc-$VERSION
--- NEW FILE xbmc.spec ---
Name: xbmc
Version: 9.11
Release: 16%{?dist}
URL: http://www.xbmc.org/
Source0: %{name}-%{version}-patched.tar.xz
# xbmc contains code that we cannot ship, as well as redundant private
# copies of upstream libraries that we already distribute. Therefore
# we use this script to remove the code before shipping it.
# Download the upstream tarball from:
# http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
# and invoke this script while in the directory where the tarball is located:
# ./xbmc-generate-tarball-xz.sh <version>
# where <version> is the particular version being used
Source1: xbmc-generate-tarball-xz.sh
# look for libdca, rather than libdts
# http://xbmc.org/trac/ticket/8040
Patch1: xbmc-9.11-libdca.patch
# Needs work before being submitted upstream
Patch2: xbmc-9.11-b1-dvdlibs-external.patch
# http://xbmc.org/trac/ticket/8026 (this will be in next release)
Patch3: xbmc-9.11-use_cdio_system_headers_on_non_win32.patch
# Next 3 patches to use %{_libdir}
# http://xbmc.org/trac/ticket/8590
Patch4: xbmc-9.11-fix-Makefile.in.patch
Patch5: xbmc-9.11-Makefile.include.in.diff
Patch6: xbmc-9.11-xbmc.sh.diff
# Next 2 patches submitted upstream
# http://www.xbmc.org/trac/ticket/8629
Patch7: xbmc-9.11-spyce.diff
Patch8: xbmc-9.11-RandomNumberGenerators.hpp.diff
# Needs work before being submitted upstream
Patch9: xbmc-9.11-remlibass.patch
# Fixes GCC warning: partial backport to 9.11
# (should be fixed in next release)
Patch10: xbmc-9.11-changeset-26191.diff
# remove goahead completely from compilation, it's been replaced
# by libmicrohttpd in SVN, so should add that BuildRequires for 10.5
# and drop this patch
Patch11: xbmc-9.11-remove-goahead.patch
# Next 12 patches submitted upstream:
# http://www.xbmc.org/trac/ticket/8629
Patch12: xbmc-9.11-external-zlib.diff
Patch13: xbmc-9.11-goom-missing.diff
Patch14: xbmc-9.11-rsxs-0.9.diff
Patch15: xbmc-9.11-Weather.diff
Patch16: xbmc-9.11-XBMCProjectM-cmake.diff
Patch17: xbmc-9.11-cflags.patch
Patch18: xbmc-9.11-configure.patch
Patch19: xbmc-9.11-gymcodec.patch
Patch20: xbmc-9.11-macdll.patch
Patch21: xbmc-9.11-maclib.patch
Patch22: xbmc-9.11-libid3tag.patch
Patch23: xbmc-9.11-librtv.patch
# these next 2 are (hopefully temporary) hacks
Patch24: xbmc-9.11-swscale.diff
Patch25: xbmc-9.11-xext.diff
# an attempt to force hdhomerun to be external
Patch26: xbmc-9.11-hdhomerun.patch
Buildroot: %{_tmppath}/%{name}-%{version}
Summary: Media center
License: GPLv2+
Group: Applications/Multimedia
BuildRequires: desktop-file-utils
BuildRequires: SDL-devel
BuildRequires: SDL_image-devel
BuildRequires: SDL_mixer-devel
BuildRequires: fontconfig-devel
BuildRequires: fribidi-devel
BuildRequires: glibc-devel
BuildRequires: hal-devel
BuildRequires: glew-devel
BuildRequires: libstdc++-devel
BuildRequires: glib2-devel
BuildRequires: libjasper-devel
BuildRequires: libjpeg-devel
BuildRequires: libogg-devel
BuildRequires: libpng-devel
BuildRequires: libstdc++-devel
BuildRequires: e2fsprogs-devel
BuildRequires: libvorbis-devel
BuildRequires: lzo-devel
BuildRequires: pcre-devel
BuildRequires: zlib-devel
BuildRequires: tre-devel
BuildRequires: boost-devel
BuildRequires: bzip2-devel
BuildRequires: freetype-devel
BuildRequires: libXinerama-devel
BuildRequires: fontconfig-devel
BuildRequires: mysql-devel
BuildRequires: jasper-devel
BuildRequires: enca-devel
BuildRequires: cmake
BuildRequires: gperf
BuildRequires: nasm
BuildRequires: libXmu-devel
BuildRequires: pcre-devel
BuildRequires: gcc-c++
BuildRequires: sqlite-devel
BuildRequires: curl-devel
BuildRequires: libcdio-devel
BuildRequires: flex
BuildRequires: libmad-devel
BuildRequires: libsamplerate-devel
BuildRequires: libsmbclient-devel
BuildRequires: libmms-devel
BuildRequires: libXtst-devel
BuildRequires: libvdpau-devel
BuildRequires: desktop-file-utils
BuildRequires: python-devel
BuildRequires: wavpack-devel
BuildRequires: a52dec-devel
BuildRequires: libmpeg2-devel
BuildRequires: libmpcdec-devel
BuildRequires: flac-devel
BuildRequires: avahi-devel
BuildRequires: libtool
BuildRequires: libtiff-devel
BuildRequires: libvdpau-devel
BuildRequires: libdvdread-devel
BuildRequires: ffmpeg-devel
BuildRequires: faad2-devel
BuildRequires: pulseaudio-libs-devel
BuildRequires: libdca-devel
BuildRequires: libass-devel >= 0.9.7
BuildRequires: hdhomerun-devel
# add following BR in next release of XBMC to get support for crystalhd devices
#BuildRequires: libcrystalhd-devel
%description
XBMC media center is a free cross-platform media-player jukebox and
entertainment hub. XBMC can play a spectrum of of multimedia formats,
and featuring playlist, audio visualizations, slideshow, and weather
forecast functions, together third-party plugins.
%prep
%setup -q -n %{name}-%{version}
%patch1 -p1 -b .dtsdca
%patch2 -p1 -b .dvdlibs
%patch3 -p1 -b .cdio
%patch4 -p0 -b .makefilein
%patch5 -p1 -b .makefileincl
%patch6 -p1 -b .xbmcsh
%patch7 -p1
%patch8 -p1 -b .rand
%patch9 -p1 -b .remlibass
%patch10 -p1 -b .gccwarning
%patch11 -p0 -b .removegoahead
%patch12 -p1 -b .zlib
%patch13 -p1 -b .goom
%patch14 -p1 -b .rsxs
%patch15 -p1 -b .weather
%patch16 -p1 -b .projectm
%patch17 -p1 -b .cflags
%patch18 -p1
%patch19 -p1
%patch20 -p1
%patch21 -p1
%patch22 -p1
%patch23 -p1
%patch24 -p1
%patch25 -p1
%patch26 -p1 -b .hdhomerun
# Prevent rerunning the autotools.
touch -r xbmc/screensavers/rsxs-0.9/aclocal.m4 \
$(find xbmc/screensavers/rsxs-0.9 \( -name 'configure.*' -o -name 'Makefile.*' \))
%build
chmod +x bootstrap
./bootstrap
# Can't use export nor %%configure (implies using export), because
# the Makefile pile up *FLAGS in this case.
./configure \
--prefix=%{_prefix} --bindir=%{_bindir} --includedir=%{_includedir} \
--libdir=%{_libdir} --datadir=%{_datadir} \
--enable-external-libraries --enable-goom \
--disable-optimizations --disable-debug \
--disable-webserver \
SVN_REV=26017 \
CPPFLAGS="-I/usr/include/ffmpeg" \
CFLAGS="$RPM_OPT_FLAGS -fPIC -I/usr/include/ffmpeg" \
CXXFLAGS="$RPM_OPT_FLAGS -fPIC -I/usr/include/ffmpeg" \
LDFLAGS="-fPIC" \
LIBS="-L%{_libdir}/mysql -lhdhomerun $LIBS" \
ASFLAGS=-fPIC
make %{?_smp_mflags} VERBOSE=1
%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install
# remove the doc files from libdir, they should be put in the docdir
rm $RPM_BUILD_ROOT/%{_libdir}/xbmc/copying.txt $RPM_BUILD_ROOT/%{_libdir}/xbmc/keymapping.txt $RPM_BUILD_ROOT/%{_libdir}/xbmc/LICENSE.GPL $RPM_BUILD_ROOT/%{_libdir}/xbmc/README.linux
# remove bogus header file
rm -f $RPM_BUILD_ROOT%{_libdir}/xbmc/visualisations/xbmc_vis.h
# make Python files executable to keep rpmlint quiet
# (spyce to be dropped from next xbmc release, so this can be dropped then)
for i in run_spyceCGI.py run_spyceCmd.py run_spyceModpy.py spyceCGI.py spyceCmd.py spyce.py verchk.py
do
chmod +x $RPM_BUILD_ROOT%{_libdir}/xbmc/system/python/spyce/$i
done
desktop-file-install \
--dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
$RPM_BUILD_ROOT%{_datadir}/applications/xbmc.desktop
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root)
%doc copying.txt keymapping.txt LICENSE.GPL README.linux
%{_bindir}/xbmc
%{_bindir}/xbmc-standalone
%{_libdir}/xbmc
%{_datadir}/xsessions/XBMC.desktop
%{_datadir}/applications/xbmc.desktop
%{_datadir}/pixmaps/xbmc.png
%changelog
* Wed Mar 24 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 9.11-16
- Add BuildRequires: hdhomerun-devel
* Sun Mar 7 2010 Rolf Fokkens <rolf fokkens[AT]wanadoo nl> - 9.11-15
- Add patch for force using hdhomerun external, had to create a
hdhomerun-devel package first
* Sat Mar 6 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 9.11-14
- Add patch that removes all webserver GoAhead functionality due to
problematic license
- Drop BR: faac-devel since it was moved to nonfree
* Fri Mar 5 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 9.11-13
- Patches to add -lXext to LIBS (thanks Ralf Corsepius)
- Hack to work around ffmpeg sws_scale() incompatibility (thanks Ralf)
- Remove bundled boost, libportaudio, libglew and extra unused zlib
header from tarball
- Call desktop-file-install as per review guidelines
- Make spyce files executable, quiets rpmlint
* Mon Feb 8 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 9.11-12
- More patches from Ralf Corsepius
- Update configure line, specify *FLAGS directly in configure line
(thanks Ralf)
- Touch rsxs Makefiles to prevent rerunning the autotools (thanks Ralf)
- Add missing %%clean (thanks Ralf)
- Remove even more unused library copies in generate tarball script
* Tue Jan 26 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 9.11-11
- Add another patch to ensure Makefile's pass compiler flags properly
(thanks Ralf C)
- Remove commands no longer needed in install
* Mon Jan 25 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 9.11-10
- Patches for RPM_OPT_FLAGS being recognised throughout (thanks
Ralf C)
- Patch for goom (Ralf C)
- Patch for using external zlib (Ralf C)
- Pass CPPFLAGS to configure (Ralf C)
* Thu Jan 21 2010 Rolf Fokkens <rolf fokkens[AT]wanadoo nl> - 9.11-9
- increase compression ratio of tarball by compressing with cx
the src.rpm is now about 20% smaller
- remove patch0 and patch1, they are obsolete now
- rename patch2 and patch10 to more meaningful name
* Thu Jan 21 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 9.11-8
- Update xbmc script patch (thanks Ralf C)
- Reorder patches, add upstream tickets where possible
- Drop SVN_REV from line until exact version clarified
* Mon Jan 18 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 9.11-7
- Remove bundled copies of libraries, and code that we can't
distribute from upstream tarball with script
- Drop patch against ffmpeg which we removed from tarball
- Trim description
* Sun Jan 17 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 9.11-6
- Add patch for web server segfaults on 64-bit (thanks Ralf Corsepius)
- Drop patch backup for .spyce, causes packaging problems (thanks Ralf
Corsepius)
- Remove bogus header from install (thanks Ralf Corsepius)
- More comprehensive pre-built Win32 binary removal (thanks Ralf
Corsepius)
- Add SVN_REV to configure line for plugins (thanks Graeme Gillies)
* Tue Jan 5 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 9.11-5
- Remove unnecessary BR: mysql-libs
- Prune out unneeded stuff from build (thanks Rolf Fokkens)
- Remove libraries not compiled (thanks Rolf Fokkens)
- Patch to some nasty GCC warnings (thanks Ralf Corsepius)
* Thu Dec 31 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 9.11-4
- Patches to fix installation paths to /usr/lib/ (thanks Ralf Corsepius)
- Patch to fix other issues: random number library (thanks Ralf Corsepius)
* Wed Dec 30 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 9.11-3
- Cleanup spec for submission to RPM Fusion
- Fix changelog entries to use standard numbering to quiet rpmlint
- Use standard URL for sourceforge tarballs
- Add BR: pulseaudio-libs-devel and others
- Add patch that removes comments in rules in Makefile.in that
prevented install target working
* Tue Dec 29 2009 Rolf Fokkens <rolf fokkens wanadoo nl> - 9.11-2
- use external libcdio again, patch by MaestroDD
* Fri Dec 25 2009 Rolf Fokkens <rolf fokkens wanadoo nl> - 9.11-1
- Update to 9.11
* Fri Dec 18 2009 Rolf Fokkens <rolf fokkens wanadoo nl> - 9.11-0.5.rc1
- Update to 9.11 rc1
* Fri Dec 11 2009 Rolf Fokkens <rolf fokkens wanadoo nl> - 9.11-0.4.beta2
- Update to 9.11 beta2
* Tue Dec 1 2009 Rolf Fokkens <rolf fokkens wanadoo nl> - 9.11-0.3.beta1
- Force using external libdvdread and libdvdcss. libdvdnav is stil internal
as xbmc needs its internals.
* Sat Nov 28 2009 Rolf Fokkens <rolf fokkens wanadoo nl> - 9.11-0.2.beta1
- replaced dependency on libdts by libdca
- removed dependency on external libcdio, use included one instead
now detection of CD's and DVD's works again
- Compiles and runs on Fedora 11
- Update to 9.11 beta1
* Sun Nov 15 2009 Rolf Fokkens <rolf fokkens wanadoo nl> - 9.11-0.1.alpha2
- Compiles and runs on Fedora 11
- Update to 9.11 alpha2
* Fri May 15 2009 Scott Harvanek <scotth(a)login.com> - 9.04-1
- Update to 9.04
* Wed Jan 28 2009 Scott Harvanek <scotth(a)login.com> - 8.10-3
- Added requires for
- alsa-plugins-pulseaudio, libogg, libmad, libvorbis
* Fri Jan 2 2009 Scott Harvanek <scotth(a)login.com> - 8.10-2
- Patch for English language strings.xml
* Thu Nov 27 2008 Scott Harvanek <scotth(a)login.com> - 8.10-1
- v8.10
- Fedora 10 RPM
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/xbmc/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 26 Mar 2010 20:02:23 -0000 1.1
+++ .cvsignore 26 Mar 2010 21:40:18 -0000 1.2
@@ -0,0 +1 @@
+xbmc-9.11-patched.tar.xz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/xbmc/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 26 Mar 2010 20:02:23 -0000 1.1
+++ sources 26 Mar 2010 21:40:18 -0000 1.2
@@ -0,0 +1 @@
+c8c54a8839b289a97140f7f41acfedc4 xbmc-9.11-patched.tar.xz
14 years, 1 month
- 1
- 0
rpms/xbmc/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/xbmc/devel
In directory se02.es.rpmfusion.net:/home/rpmfusion/kwizart/free/owners/tmpcvsu16629/rpms/xbmc/devel
Added Files:
.cvsignore Makefile sources
Log Message:
Setup of module xbmc
--- NEW FILE .cvsignore ---
--- NEW FILE Makefile ---
# Makefile for source rpm: xbmc
# $Id: Makefile,v 1.1 2010/03/26 20:02:23 kwizart Exp $
NAME := xbmc
SPECFILE = $(firstword $(wildcard *.spec))
define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef
MAKEFILE_COMMON := $(shell $(find-makefile-common))
ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef
MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif
include $(MAKEFILE_COMMON)
--- NEW FILE sources ---
14 years, 1 month
- 1
- 0