diff -Nru xbmc-pvr~10.08~svn35025/addons/metadata.albums.allmusic.com/resources/language/Chinese (Simple)/.svn/entries xbmc-pvr~10.08~svn35177/addons/metadata.albums.allmusic.com/resources/language/Chinese (Simple)/.svn/entries --- xbmc-pvr~10.08~svn35025/addons/metadata.albums.allmusic.com/resources/language/Chinese (Simple)/.svn/entries 2010-10-26 19:34:00.000000000 +0000 +++ xbmc-pvr~10.08~svn35177/addons/metadata.albums.allmusic.com/resources/language/Chinese (Simple)/.svn/entries 2010-11-05 20:41:53.000000000 +0000 @@ -1,7 +1,7 @@ 10 dir -35025 +35177 https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/pvr-testing2/addons/metadata.albums.allmusic.com/resources/language/Chinese%20(Simple) https://xbmc.svn.sourceforge.net/svnroot/xbmc diff -Nru xbmc-pvr~10.08~svn35025/addons/metadata.artists.allmusic.com/resources/language/Chinese (Simple)/.svn/entries xbmc-pvr~10.08~svn35177/addons/metadata.artists.allmusic.com/resources/language/Chinese (Simple)/.svn/entries --- xbmc-pvr~10.08~svn35025/addons/metadata.artists.allmusic.com/resources/language/Chinese (Simple)/.svn/entries 2010-10-26 19:34:00.000000000 +0000 +++ xbmc-pvr~10.08~svn35177/addons/metadata.artists.allmusic.com/resources/language/Chinese (Simple)/.svn/entries 2010-11-05 20:41:53.000000000 +0000 @@ -1,7 +1,7 @@ 10 dir -35025 +35177 https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/pvr-testing2/addons/metadata.artists.allmusic.com/resources/language/Chinese%20(Simple) https://xbmc.svn.sourceforge.net/svnroot/xbmc diff -Nru xbmc-pvr~10.08~svn35025/addons/metadata.themoviedb.org/resources/language/Chinese (Simple)/.svn/entries xbmc-pvr~10.08~svn35177/addons/metadata.themoviedb.org/resources/language/Chinese (Simple)/.svn/entries --- xbmc-pvr~10.08~svn35025/addons/metadata.themoviedb.org/resources/language/Chinese (Simple)/.svn/entries 2010-10-26 19:34:00.000000000 +0000 +++ xbmc-pvr~10.08~svn35177/addons/metadata.themoviedb.org/resources/language/Chinese (Simple)/.svn/entries 2010-11-05 20:41:53.000000000 +0000 @@ -1,7 +1,7 @@ 10 dir -35025 +35177 https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/pvr-testing2/addons/metadata.themoviedb.org/resources/language/Chinese%20(Simple) https://xbmc.svn.sourceforge.net/svnroot/xbmc diff -Nru xbmc-pvr~10.08~svn35025/addons/metadata.tvdb.com/resources/language/Chinese (Simple)/.svn/entries xbmc-pvr~10.08~svn35177/addons/metadata.tvdb.com/resources/language/Chinese (Simple)/.svn/entries --- xbmc-pvr~10.08~svn35025/addons/metadata.tvdb.com/resources/language/Chinese (Simple)/.svn/entries 2010-10-26 19:34:00.000000000 +0000 +++ xbmc-pvr~10.08~svn35177/addons/metadata.tvdb.com/resources/language/Chinese (Simple)/.svn/entries 2010-11-05 20:41:53.000000000 +0000 @@ -1,7 +1,7 @@ 10 dir -35025 +35177 https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/pvr-testing2/addons/metadata.tvdb.com/resources/language/Chinese%20(Simple) https://xbmc.svn.sourceforge.net/svnroot/xbmc diff -Nru xbmc-pvr~10.08~svn35025/addons/screensaver.xbmc.builtin.dim/resources/language/Chinese (Simple)/.svn/entries xbmc-pvr~10.08~svn35177/addons/screensaver.xbmc.builtin.dim/resources/language/Chinese (Simple)/.svn/entries --- xbmc-pvr~10.08~svn35025/addons/screensaver.xbmc.builtin.dim/resources/language/Chinese (Simple)/.svn/entries 2010-10-26 19:34:00.000000000 +0000 +++ xbmc-pvr~10.08~svn35177/addons/screensaver.xbmc.builtin.dim/resources/language/Chinese (Simple)/.svn/entries 2010-11-05 20:41:53.000000000 +0000 @@ -1,7 +1,7 @@ 10 dir -35025 +35177 https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/pvr-testing2/addons/screensaver.xbmc.builtin.dim/resources/language/Chinese%20(Simple) https://xbmc.svn.sourceforge.net/svnroot/xbmc diff -Nru xbmc-pvr~10.08~svn35025/addons/screensaver.xbmc.builtin.slideshow/resources/language/Chinese (Simple)/.svn/entries xbmc-pvr~10.08~svn35177/addons/screensaver.xbmc.builtin.slideshow/resources/language/Chinese (Simple)/.svn/entries --- xbmc-pvr~10.08~svn35025/addons/screensaver.xbmc.builtin.slideshow/resources/language/Chinese (Simple)/.svn/entries 2010-10-26 19:34:00.000000000 +0000 +++ xbmc-pvr~10.08~svn35177/addons/screensaver.xbmc.builtin.slideshow/resources/language/Chinese (Simple)/.svn/entries 2010-11-05 20:41:53.000000000 +0000 @@ -1,7 +1,7 @@ 10 dir -35025 +35177 https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/pvr-testing2/addons/screensaver.xbmc.builtin.slideshow/resources/language/Chinese%20(Simple) https://xbmc.svn.sourceforge.net/svnroot/xbmc diff -Nru xbmc-pvr~10.08~svn35025/addons/skin.confluence/language/Chinese (Simple)/.svn/entries xbmc-pvr~10.08~svn35177/addons/skin.confluence/language/Chinese (Simple)/.svn/entries --- xbmc-pvr~10.08~svn35025/addons/skin.confluence/language/Chinese (Simple)/.svn/entries 2010-10-26 19:34:00.000000000 +0000 +++ xbmc-pvr~10.08~svn35177/addons/skin.confluence/language/Chinese (Simple)/.svn/entries 2010-11-05 20:41:53.000000000 +0000 @@ -1,7 +1,7 @@ 10 dir -35025 +35177 https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/pvr-testing2/addons/skin.confluence/language/Chinese%20(Simple) https://xbmc.svn.sourceforge.net/svnroot/xbmc diff -Nru xbmc-pvr~10.08~svn35025/addons/skin.confluence/language/Portuguese (Brazil)/.svn/entries xbmc-pvr~10.08~svn35177/addons/skin.confluence/language/Portuguese (Brazil)/.svn/entries --- xbmc-pvr~10.08~svn35025/addons/skin.confluence/language/Portuguese (Brazil)/.svn/entries 2010-10-26 19:34:00.000000000 +0000 +++ xbmc-pvr~10.08~svn35177/addons/skin.confluence/language/Portuguese (Brazil)/.svn/entries 2010-11-05 20:41:53.000000000 +0000 @@ -1,7 +1,7 @@ 10 dir -35025 +35177 https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/pvr-testing2/addons/skin.confluence/language/Portuguese%20(Brazil) https://xbmc.svn.sourceforge.net/svnroot/xbmc diff -Nru xbmc-pvr~10.08~svn35025/addons/skin.confluence/language/Serbian (Cyrillic)/.svn/entries xbmc-pvr~10.08~svn35177/addons/skin.confluence/language/Serbian (Cyrillic)/.svn/entries --- xbmc-pvr~10.08~svn35025/addons/skin.confluence/language/Serbian (Cyrillic)/.svn/entries 2010-10-26 19:34:00.000000000 +0000 +++ xbmc-pvr~10.08~svn35177/addons/skin.confluence/language/Serbian (Cyrillic)/.svn/entries 2010-11-05 20:41:53.000000000 +0000 @@ -1,7 +1,7 @@ 10 dir -35025 +35177 https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/pvr-testing2/addons/skin.confluence/language/Serbian%20(Cyrillic) https://xbmc.svn.sourceforge.net/svnroot/xbmc diff -Nru xbmc-pvr~10.08~svn35025/addons/skin.confluence/media/Apple Movie Trailers/.svn/entries xbmc-pvr~10.08~svn35177/addons/skin.confluence/media/Apple Movie Trailers/.svn/entries --- xbmc-pvr~10.08~svn35025/addons/skin.confluence/media/Apple Movie Trailers/.svn/entries 2010-10-26 19:34:00.000000000 +0000 +++ xbmc-pvr~10.08~svn35177/addons/skin.confluence/media/Apple Movie Trailers/.svn/entries 2010-11-05 20:41:53.000000000 +0000 @@ -1,7 +1,7 @@ 10 dir -35025 +35177 https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/pvr-testing2/addons/skin.confluence/media/Apple%20Movie%20Trailers https://xbmc.svn.sourceforge.net/svnroot/xbmc diff -Nru xbmc-pvr~10.08~svn35025/addons/visualization.dxspectrum/resources/language/Chinese (Simple)/.svn/entries xbmc-pvr~10.08~svn35177/addons/visualization.dxspectrum/resources/language/Chinese (Simple)/.svn/entries --- xbmc-pvr~10.08~svn35025/addons/visualization.dxspectrum/resources/language/Chinese (Simple)/.svn/entries 2010-10-26 19:34:00.000000000 +0000 +++ xbmc-pvr~10.08~svn35177/addons/visualization.dxspectrum/resources/language/Chinese (Simple)/.svn/entries 2010-11-05 20:41:53.000000000 +0000 @@ -1,7 +1,7 @@ 10 dir -35025 +35177 https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/pvr-testing2/addons/visualization.dxspectrum/resources/language/Chinese%20(Simple) https://xbmc.svn.sourceforge.net/svnroot/xbmc diff -Nru xbmc-pvr~10.08~svn35025/addons/visualization.glspectrum/resources/language/Chinese (Simple)/.svn/entries xbmc-pvr~10.08~svn35177/addons/visualization.glspectrum/resources/language/Chinese (Simple)/.svn/entries --- xbmc-pvr~10.08~svn35025/addons/visualization.glspectrum/resources/language/Chinese (Simple)/.svn/entries 2010-10-26 19:34:00.000000000 +0000 +++ xbmc-pvr~10.08~svn35177/addons/visualization.glspectrum/resources/language/Chinese (Simple)/.svn/entries 2010-11-05 20:41:53.000000000 +0000 @@ -1,7 +1,7 @@ 10 dir -35025 +35177 https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/pvr-testing2/addons/visualization.glspectrum/resources/language/Chinese%20(Simple) https://xbmc.svn.sourceforge.net/svnroot/xbmc diff -Nru xbmc-pvr~10.08~svn35025/addons/visualization.milkdrop/resources/language/Chinese (Simple)/.svn/entries xbmc-pvr~10.08~svn35177/addons/visualization.milkdrop/resources/language/Chinese (Simple)/.svn/entries --- xbmc-pvr~10.08~svn35025/addons/visualization.milkdrop/resources/language/Chinese (Simple)/.svn/entries 2010-10-26 19:34:00.000000000 +0000 +++ xbmc-pvr~10.08~svn35177/addons/visualization.milkdrop/resources/language/Chinese (Simple)/.svn/entries 2010-11-05 20:41:52.000000000 +0000 @@ -1,7 +1,7 @@ 10 dir -35025 +35177 https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/pvr-testing2/addons/visualization.milkdrop/resources/language/Chinese%20(Simple) https://xbmc.svn.sourceforge.net/svnroot/xbmc diff -Nru xbmc-pvr~10.08~svn35025/addons/visualization.projectm/resources/language/Chinese (Simple)/.svn/entries xbmc-pvr~10.08~svn35177/addons/visualization.projectm/resources/language/Chinese (Simple)/.svn/entries --- xbmc-pvr~10.08~svn35025/addons/visualization.projectm/resources/language/Chinese (Simple)/.svn/entries 2010-10-26 19:34:00.000000000 +0000 +++ xbmc-pvr~10.08~svn35177/addons/visualization.projectm/resources/language/Chinese (Simple)/.svn/entries 2010-11-05 20:41:52.000000000 +0000 @@ -1,7 +1,7 @@ 10 dir -35025 +35177 https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/pvr-testing2/addons/visualization.projectm/resources/language/Chinese%20(Simple) https://xbmc.svn.sourceforge.net/svnroot/xbmc diff -Nru xbmc-pvr~10.08~svn35025/debian/changelog xbmc-pvr~10.08~svn35177/debian/changelog --- xbmc-pvr~10.08~svn35025/debian/changelog 2010-10-26 20:07:57.000000000 +0000 +++ xbmc-pvr~10.08~svn35177/debian/changelog 2010-11-05 20:50:23.000000000 +0000 @@ -1,4 +1,4 @@ -xbmc (2:pvr~10.08~svn35025-lucid1) lucid; urgency=low +xbmc (2:pvr~10.08~svn35177-lucid1) lucid; urgency=low * pvr-testing2 xbmc branch * Add schedule recording from XBMC by Gregor Fuis @@ -8,7 +8,7 @@ * Use FFMPEG for AAC backported from trunk * Fix EPG categories - -- Gregor Fuis Tue, 26 Oct 2010 22:07:51 +0200 + -- Gregor Fuis Fri, 05 Nov 2010 21:50:17 +0100 xbmc (2:10.0~svn32746~deb1-1) experimental; urgency=low diff -Nru xbmc-pvr~10.08~svn35025/language/Chinese (Simple)/.svn/entries xbmc-pvr~10.08~svn35177/language/Chinese (Simple)/.svn/entries --- xbmc-pvr~10.08~svn35025/language/Chinese (Simple)/.svn/entries 2010-10-26 19:33:58.000000000 +0000 +++ xbmc-pvr~10.08~svn35177/language/Chinese (Simple)/.svn/entries 2010-11-05 20:41:45.000000000 +0000 @@ -1,7 +1,7 @@ 10 dir -35025 +35177 https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/pvr-testing2/language/Chinese%20(Simple) https://xbmc.svn.sourceforge.net/svnroot/xbmc diff -Nru xbmc-pvr~10.08~svn35025/language/Chinese (Traditional)/.svn/entries xbmc-pvr~10.08~svn35177/language/Chinese (Traditional)/.svn/entries --- xbmc-pvr~10.08~svn35025/language/Chinese (Traditional)/.svn/entries 2010-10-26 19:33:58.000000000 +0000 +++ xbmc-pvr~10.08~svn35177/language/Chinese (Traditional)/.svn/entries 2010-11-05 20:41:45.000000000 +0000 @@ -1,7 +1,7 @@ 10 dir -35025 +35177 https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/pvr-testing2/language/Chinese%20(Traditional) https://xbmc.svn.sourceforge.net/svnroot/xbmc diff -Nru xbmc-pvr~10.08~svn35025/language/English (US)/.svn/entries xbmc-pvr~10.08~svn35177/language/English (US)/.svn/entries --- xbmc-pvr~10.08~svn35025/language/English (US)/.svn/entries 2010-10-26 19:33:58.000000000 +0000 +++ xbmc-pvr~10.08~svn35177/language/English (US)/.svn/entries 2010-11-05 20:41:45.000000000 +0000 @@ -1,7 +1,7 @@ 10 dir -35025 +35177 https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/pvr-testing2/language/English%20(US) https://xbmc.svn.sourceforge.net/svnroot/xbmc diff -Nru xbmc-pvr~10.08~svn35025/language/Portuguese (Brazil)/.svn/entries xbmc-pvr~10.08~svn35177/language/Portuguese (Brazil)/.svn/entries --- xbmc-pvr~10.08~svn35025/language/Portuguese (Brazil)/.svn/entries 2010-10-26 19:33:58.000000000 +0000 +++ xbmc-pvr~10.08~svn35177/language/Portuguese (Brazil)/.svn/entries 2010-11-05 20:41:45.000000000 +0000 @@ -1,7 +1,7 @@ 10 dir -35025 +35177 https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/pvr-testing2/language/Portuguese%20(Brazil) https://xbmc.svn.sourceforge.net/svnroot/xbmc diff -Nru xbmc-pvr~10.08~svn35025/language/Serbian (Cyrillic)/.svn/entries xbmc-pvr~10.08~svn35177/language/Serbian (Cyrillic)/.svn/entries --- xbmc-pvr~10.08~svn35025/language/Serbian (Cyrillic)/.svn/entries 2010-10-26 19:33:58.000000000 +0000 +++ xbmc-pvr~10.08~svn35177/language/Serbian (Cyrillic)/.svn/entries 2010-11-05 20:41:45.000000000 +0000 @@ -1,7 +1,7 @@ 10 dir -35025 +35177 https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/pvr-testing2/language/Serbian%20(Cyrillic) https://xbmc.svn.sourceforge.net/svnroot/xbmc diff -Nru xbmc-pvr~10.08~svn35025/language/Spanish (Mexico)/.svn/entries xbmc-pvr~10.08~svn35177/language/Spanish (Mexico)/.svn/entries --- xbmc-pvr~10.08~svn35025/language/Spanish (Mexico)/.svn/entries 2010-10-26 19:33:58.000000000 +0000 +++ xbmc-pvr~10.08~svn35177/language/Spanish (Mexico)/.svn/entries 2010-11-05 20:41:45.000000000 +0000 @@ -1,7 +1,7 @@ 10 dir -35025 +35177 https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/pvr-testing2/language/Spanish%20(Mexico) https://xbmc.svn.sourceforge.net/svnroot/xbmc diff -Nru xbmc-pvr~10.08~svn35025/lib/addons/library.xbmc.addon/Makefile.in xbmc-pvr~10.08~svn35177/lib/addons/library.xbmc.addon/Makefile.in --- xbmc-pvr~10.08~svn35025/lib/addons/library.xbmc.addon/Makefile.in 2010-08-07 14:32:39.000000000 +0000 +++ xbmc-pvr~10.08~svn35177/lib/addons/library.xbmc.addon/Makefile.in 2010-11-05 20:41:45.000000000 +0000 @@ -15,7 +15,7 @@ $(CXX) -bundle -shared -flat_namespace -undefined suppress -o $(LIB_SHARED) $(OBJS) ../../../tools/Mach5/wrapper.rb $@;mv output.so $@ else - $(CXX) $(CFLAGS) -shared -g -o $(LIB_SHARED) $(OBJS) + $(CXX) $(CFLAGS) $(LDFLAGS) -shared -g -o $(LIB_SHARED) $(OBJS) endif CLEAN_FILES = \ diff -Nru xbmc-pvr~10.08~svn35025/lib/addons/library.xbmc.gui/Makefile.in xbmc-pvr~10.08~svn35177/lib/addons/library.xbmc.gui/Makefile.in --- xbmc-pvr~10.08~svn35025/lib/addons/library.xbmc.gui/Makefile.in 2010-08-07 14:32:39.000000000 +0000 +++ xbmc-pvr~10.08~svn35177/lib/addons/library.xbmc.gui/Makefile.in 2010-11-05 20:41:45.000000000 +0000 @@ -15,7 +15,7 @@ $(CXX) -bundle -shared -flat_namespace -undefined suppress -o $(LIB_SHARED) $(OBJS) ../../../tools/Mach5/wrapper.rb $@;mv output.so $@ else - $(CXX) $(CFLAGS) -shared -g -o $(LIB_SHARED) $(OBJS) + $(CXX) $(CFLAGS) $(LDFLAGS) -shared -g -o $(LIB_SHARED) $(OBJS) endif CLEAN_FILES = \ diff -Nru xbmc-pvr~10.08~svn35025/lib/addons/library.xbmc.pvr/Makefile.in xbmc-pvr~10.08~svn35177/lib/addons/library.xbmc.pvr/Makefile.in --- xbmc-pvr~10.08~svn35025/lib/addons/library.xbmc.pvr/Makefile.in 2010-08-07 14:32:42.000000000 +0000 +++ xbmc-pvr~10.08~svn35177/lib/addons/library.xbmc.pvr/Makefile.in 2010-11-05 20:41:45.000000000 +0000 @@ -15,7 +15,7 @@ $(CXX) -bundle -shared -flat_namespace -undefined suppress -o $(LIB_SHARED) $(OBJS) ../../../tools/Mach5/wrapper.rb $@;mv output.so $@ else - $(CXX) $(CFLAGS) -shared -g -o $(LIB_SHARED) $(OBJS) + $(CXX) $(CFLAGS) $(LDFLAGS) -shared -g -o $(LIB_SHARED) $(OBJS) endif CLEAN_FILES = \ diff -Nru xbmc-pvr~10.08~svn35025/sounds/Bursting Bubbles/.svn/entries xbmc-pvr~10.08~svn35177/sounds/Bursting Bubbles/.svn/entries --- xbmc-pvr~10.08~svn35025/sounds/Bursting Bubbles/.svn/entries 2010-10-26 19:34:00.000000000 +0000 +++ xbmc-pvr~10.08~svn35177/sounds/Bursting Bubbles/.svn/entries 2010-11-05 20:41:53.000000000 +0000 @@ -1,7 +1,7 @@ 10 dir -35025 +35177 https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/pvr-testing2/sounds/Bursting%20Bubbles https://xbmc.svn.sourceforge.net/svnroot/xbmc diff -Nru xbmc-pvr~10.08~svn35025/tools/EventClients/Clients/J2ME Client/icons/.svn/entries xbmc-pvr~10.08~svn35177/tools/EventClients/Clients/J2ME Client/icons/.svn/entries --- xbmc-pvr~10.08~svn35025/tools/EventClients/Clients/J2ME Client/icons/.svn/entries 2010-10-26 19:34:00.000000000 +0000 +++ xbmc-pvr~10.08~svn35177/tools/EventClients/Clients/J2ME Client/icons/.svn/entries 2010-11-05 20:41:51.000000000 +0000 @@ -1,7 +1,7 @@ 10 dir -35025 +35177 https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/pvr-testing2/tools/EventClients/Clients/J2ME%20Client/icons https://xbmc.svn.sourceforge.net/svnroot/xbmc diff -Nru xbmc-pvr~10.08~svn35025/tools/EventClients/Clients/J2ME Client/src/.svn/entries xbmc-pvr~10.08~svn35177/tools/EventClients/Clients/J2ME Client/src/.svn/entries --- xbmc-pvr~10.08~svn35025/tools/EventClients/Clients/J2ME Client/src/.svn/entries 2010-10-26 19:34:00.000000000 +0000 +++ xbmc-pvr~10.08~svn35177/tools/EventClients/Clients/J2ME Client/src/.svn/entries 2010-11-05 20:41:51.000000000 +0000 @@ -1,7 +1,7 @@ 10 dir -35025 +35177 https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/pvr-testing2/tools/EventClients/Clients/J2ME%20Client/src https://xbmc.svn.sourceforge.net/svnroot/xbmc diff -Nru xbmc-pvr~10.08~svn35025/tools/EventClients/Clients/J2ME Client/.svn/entries xbmc-pvr~10.08~svn35177/tools/EventClients/Clients/J2ME Client/.svn/entries --- xbmc-pvr~10.08~svn35025/tools/EventClients/Clients/J2ME Client/.svn/entries 2010-10-26 19:34:00.000000000 +0000 +++ xbmc-pvr~10.08~svn35177/tools/EventClients/Clients/J2ME Client/.svn/entries 2010-11-05 20:41:51.000000000 +0000 @@ -1,7 +1,7 @@ 10 dir -35025 +35177 https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/pvr-testing2/tools/EventClients/Clients/J2ME%20Client https://xbmc.svn.sourceforge.net/svnroot/xbmc diff -Nru xbmc-pvr~10.08~svn35025/tools/EventClients/Clients/PS3 BD Remote/.svn/entries xbmc-pvr~10.08~svn35177/tools/EventClients/Clients/PS3 BD Remote/.svn/entries --- xbmc-pvr~10.08~svn35025/tools/EventClients/Clients/PS3 BD Remote/.svn/entries 2010-10-26 19:34:00.000000000 +0000 +++ xbmc-pvr~10.08~svn35177/tools/EventClients/Clients/PS3 BD Remote/.svn/entries 2010-11-05 20:41:51.000000000 +0000 @@ -1,7 +1,7 @@ 10 dir -35025 +35177 https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/pvr-testing2/tools/EventClients/Clients/PS3%20BD%20Remote https://xbmc.svn.sourceforge.net/svnroot/xbmc diff -Nru xbmc-pvr~10.08~svn35025/tools/EventClients/Clients/PS3 Sixaxis Controller/.svn/entries xbmc-pvr~10.08~svn35177/tools/EventClients/Clients/PS3 Sixaxis Controller/.svn/entries --- xbmc-pvr~10.08~svn35025/tools/EventClients/Clients/PS3 Sixaxis Controller/.svn/entries 2010-10-26 19:34:00.000000000 +0000 +++ xbmc-pvr~10.08~svn35177/tools/EventClients/Clients/PS3 Sixaxis Controller/.svn/entries 2010-11-05 20:41:51.000000000 +0000 @@ -1,7 +1,7 @@ 10 dir -35025 +35177 https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/pvr-testing2/tools/EventClients/Clients/PS3%20Sixaxis%20Controller https://xbmc.svn.sourceforge.net/svnroot/xbmc diff -Nru xbmc-pvr~10.08~svn35025/tools/EventClients/Clients/XBMC Send/.svn/entries xbmc-pvr~10.08~svn35177/tools/EventClients/Clients/XBMC Send/.svn/entries --- xbmc-pvr~10.08~svn35025/tools/EventClients/Clients/XBMC Send/.svn/entries 2010-10-26 19:34:00.000000000 +0000 +++ xbmc-pvr~10.08~svn35177/tools/EventClients/Clients/XBMC Send/.svn/entries 2010-11-05 20:41:51.000000000 +0000 @@ -1,7 +1,7 @@ 10 dir -35025 +35177 https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/pvr-testing2/tools/EventClients/Clients/XBMC%20Send https://xbmc.svn.sourceforge.net/svnroot/xbmc diff -Nru xbmc-pvr~10.08~svn35025/tools/EventClients/Clients/Xbox360 Controller/.svn/entries xbmc-pvr~10.08~svn35177/tools/EventClients/Clients/Xbox360 Controller/.svn/entries --- xbmc-pvr~10.08~svn35025/tools/EventClients/Clients/Xbox360 Controller/.svn/entries 2010-10-26 19:34:00.000000000 +0000 +++ xbmc-pvr~10.08~svn35177/tools/EventClients/Clients/Xbox360 Controller/.svn/entries 2010-11-05 20:41:51.000000000 +0000 @@ -1,7 +1,7 @@ 10 dir -35025 +35177 https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/pvr-testing2/tools/EventClients/Clients/Xbox360%20Controller https://xbmc.svn.sourceforge.net/svnroot/xbmc diff -Nru xbmc-pvr~10.08~svn35025/tools/Fake Episode Maker/.svn/entries xbmc-pvr~10.08~svn35177/tools/Fake Episode Maker/.svn/entries --- xbmc-pvr~10.08~svn35025/tools/Fake Episode Maker/.svn/entries 2010-10-26 19:34:00.000000000 +0000 +++ xbmc-pvr~10.08~svn35177/tools/Fake Episode Maker/.svn/entries 2010-11-05 20:41:51.000000000 +0000 @@ -1,7 +1,7 @@ 10 dir -35025 +35177 https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/pvr-testing2/tools/Fake%20Episode%20Maker https://xbmc.svn.sourceforge.net/svnroot/xbmc diff -Nru xbmc-pvr~10.08~svn35025/tools/PackageMaker/XBMC Package.pmdoc/.svn/entries xbmc-pvr~10.08~svn35177/tools/PackageMaker/XBMC Package.pmdoc/.svn/entries --- xbmc-pvr~10.08~svn35025/tools/PackageMaker/XBMC Package.pmdoc/.svn/entries 2010-10-26 19:34:00.000000000 +0000 +++ xbmc-pvr~10.08~svn35177/tools/PackageMaker/XBMC Package.pmdoc/.svn/entries 2010-11-05 20:41:51.000000000 +0000 @@ -1,7 +1,7 @@ 10 dir -35025 +35177 https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/pvr-testing2/tools/PackageMaker/XBMC%20Package.pmdoc https://xbmc.svn.sourceforge.net/svnroot/xbmc diff -Nru xbmc-pvr~10.08~svn35025/xbmc/cores/dvdplayer/DVDCodecs/DVDCodecUtils.cpp xbmc-pvr~10.08~svn35177/xbmc/cores/dvdplayer/DVDCodecs/DVDCodecUtils.cpp --- xbmc-pvr~10.08~svn35025/xbmc/cores/dvdplayer/DVDCodecs/DVDCodecUtils.cpp 2010-08-07 11:43:35.000000000 +0000 +++ xbmc-pvr~10.08~svn35177/xbmc/cores/dvdplayer/DVDCodecs/DVDCodecUtils.cpp 2010-11-05 20:50:38.000000000 +0000 @@ -349,3 +349,14 @@ return true; } +bool CDVDCodecUtils::IsVP3CompatibleWidth(int width) +{ + // Some nVidia VP3 hardware "may not support H.264 streams with the following macroblock widths" - per nVidia vdpau notes. + int unsupported[] = {49, 54, 59, 64, 113, 118, 123, 128}; + for (unsigned int i = 0; i < sizeof(unsupported) / sizeof(int); i++) + { + if (unsupported[i] == (width + 15) / 16) + return false; + } + return true; +} diff -Nru xbmc-pvr~10.08~svn35025/xbmc/cores/dvdplayer/DVDCodecs/DVDCodecUtils.h xbmc-pvr~10.08~svn35177/xbmc/cores/dvdplayer/DVDCodecs/DVDCodecUtils.h --- xbmc-pvr~10.08~svn35025/xbmc/cores/dvdplayer/DVDCodecs/DVDCodecUtils.h 2010-08-07 11:43:35.000000000 +0000 +++ xbmc-pvr~10.08~svn35177/xbmc/cores/dvdplayer/DVDCodecs/DVDCodecUtils.h 2010-11-05 20:50:38.000000000 +0000 @@ -37,5 +37,7 @@ static DVDVideoPicture* ConvertToYUV422PackedPicture(DVDVideoPicture *pSrc, DVDVideoPicture::EFormat format); static bool CopyNV12Picture(YV12Image* pImage, DVDVideoPicture *pSrc); static bool CopyYUV422PackedPicture(YV12Image* pImage, DVDVideoPicture *pSrc); + + static bool IsVP3CompatibleWidth(int width); }; diff -Nru xbmc-pvr~10.08~svn35025/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp xbmc-pvr~10.08~svn35177/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp --- xbmc-pvr~10.08~svn35025/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp 2010-08-07 11:43:35.000000000 +0000 +++ xbmc-pvr~10.08~svn35177/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp 2010-11-05 20:50:38.000000000 +0000 @@ -498,6 +498,9 @@ m_iLastKeyframe = m_pCodecContext->has_b_frames; m_dllAvCodec.avcodec_flush_buffers(m_pCodecContext); + if (m_pHardware) + m_pHardware->Reset(); + if (m_pConvertFrame) { delete[] m_pConvertFrame->data[0]; @@ -506,7 +509,7 @@ } } -bool CDVDVideoCodecFFmpeg::GetPicture(DVDVideoPicture* pDvdVideoPicture) +bool CDVDVideoCodecFFmpeg::GetPictureCommon(DVDVideoPicture* pDvdVideoPicture) { GetVideoAspect(m_pCodecContext, pDvdVideoPicture->iDisplayWidth, pDvdVideoPicture->iDisplayHeight); @@ -564,9 +567,17 @@ if(!m_started) pDvdVideoPicture->iFlags |= DVP_FLAG_DROPPED; + return true; +} + +bool CDVDVideoCodecFFmpeg::GetPicture(DVDVideoPicture* pDvdVideoPicture) +{ if(m_pHardware) return m_pHardware->GetPicture(m_pCodecContext, m_pFrame, pDvdVideoPicture); + if(!GetPictureCommon(pDvdVideoPicture)) + return false; + if(m_pConvertFrame) { for (int i = 0; i < 4; i++) @@ -577,9 +588,9 @@ else { for (int i = 0; i < 4; i++) - pDvdVideoPicture->data[i] = frame->data[i]; + pDvdVideoPicture->data[i] = m_pFrame->data[i]; for (int i = 0; i < 4; i++) - pDvdVideoPicture->iLineSize[i] = frame->linesize[i]; + pDvdVideoPicture->iLineSize[i] = m_pFrame->linesize[i]; } pDvdVideoPicture->iFlags |= pDvdVideoPicture->data[0] ? 0 : DVP_FLAG_DROPPED; diff -Nru xbmc-pvr~10.08~svn35025/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.h xbmc-pvr~10.08~svn35177/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.h --- xbmc-pvr~10.08~svn35025/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.h 2010-08-07 11:43:35.000000000 +0000 +++ xbmc-pvr~10.08~svn35177/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.h 2010-11-05 20:50:38.000000000 +0000 @@ -41,6 +41,7 @@ virtual int Decode (AVCodecContext* avctx, AVFrame* frame) = 0; virtual bool GetPicture(AVCodecContext* avctx, AVFrame* frame, DVDVideoPicture* picture) = 0; virtual int Check (AVCodecContext* avctx) = 0; + virtual void Reset () {} virtual const std::string Name() = 0; virtual CCriticalSection* Section() { return NULL; } virtual long Release(); @@ -55,6 +56,7 @@ virtual void Dispose(); virtual int Decode(BYTE* pData, int iSize, double dts, double pts); virtual void Reset(); + bool GetPictureCommon(DVDVideoPicture* pDvdVideoPicture); virtual bool GetPicture(DVDVideoPicture* pDvdVideoPicture); virtual void SetDropState(bool bDrop); virtual const char* GetName() { return m_name.c_str(); }; // m_name is never changed after open diff -Nru xbmc-pvr~10.08~svn35025/xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.cpp xbmc-pvr~10.08~svn35177/xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.cpp --- xbmc-pvr~10.08~svn35025/xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.cpp 2010-08-07 11:43:35.000000000 +0000 +++ xbmc-pvr~10.08~svn35177/xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.cpp 2010-11-05 20:50:38.000000000 +0000 @@ -468,6 +468,7 @@ bool CDecoder::GetPicture(AVCodecContext* avctx, AVFrame* frame, DVDVideoPicture* picture) { + ((CDVDVideoCodecFFmpeg*)avctx->opaque)->GetPictureCommon(picture); CSingleLock lock(m_section); picture->format = DVDVideoPicture::FMT_DXVA; picture->proc = m_processor; diff -Nru xbmc-pvr~10.08~svn35025/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp xbmc-pvr~10.08~svn35177/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp --- xbmc-pvr~10.08~svn35025/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp 2010-08-07 11:43:35.000000000 +0000 +++ xbmc-pvr~10.08~svn35177/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp 2010-11-05 20:50:38.000000000 +0000 @@ -404,6 +404,7 @@ bool CDecoder::GetPicture(AVCodecContext* avctx, AVFrame* frame, DVDVideoPicture* picture) { + ((CDVDVideoCodecFFmpeg*)avctx->opaque)->GetPictureCommon(picture); VASurfaceID surface = GetSurfaceID(frame); diff -Nru xbmc-pvr~10.08~svn35025/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp xbmc-pvr~10.08~svn35177/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp --- xbmc-pvr~10.08~svn35025/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp 2010-10-26 20:31:19.000000000 +0000 +++ xbmc-pvr~10.08~svn35177/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp 2010-11-05 20:50:38.000000000 +0000 @@ -33,6 +33,8 @@ #include "AdvancedSettings.h" #include "Application.h" #include "MathUtils.h" +#include "DVDCodecUtils.h" + #define ARSIZE(x) (sizeof(x) / sizeof((x)[0])) CVDPAU::Desc decoder_profiles[] = { @@ -154,19 +156,8 @@ #endif if(profile) { - /* VDPAU Features Note 1 - GPUs with this note may not support H.264 streams with the following widths: - 49, 54, 59, 64, 113, 118, 123, 128 macroblocks - (769-784, 849-864, 929-944, 1009-1024, 1793-1808, 1873-1888, 1953-1968, 2033-2048 pixels). */ - int unsupported[] = {49, 54, 59, 64, 113, 118, 123, 128}; - for (unsigned int i = 0; i < sizeof(unsupported) / sizeof(int); i++) - { - if (unsupported[i] == (avctx->width + 15) / 16) - { - CLog::Log(LOGWARNING,"(VDPAU) width %i might not be supported because of hardware bug", avctx->width); - break; - } - } + if (!CDVDCodecUtils::IsVP3CompatibleWidth(avctx->width)) + CLog::Log(LOGWARNING,"(VDPAU) width %i might not be supported because of hardware bug", avctx->width); /* attempt to create a decoder with this width/height, some sizes are not supported by hw */ VdpStatus vdp_st; @@ -614,10 +605,20 @@ VDP_VIDEO_MIXER_FEATURE_DEINTERLACE_TEMPORAL_SPATIAL, VDP_VIDEO_MIXER_FEATURE_INVERSE_TELECINE }; + dintFull = true; if (method == VS_INTERLACEMETHOD_AUTO) { - VdpBool enabled[]={1,1,0}; - vdp_st = vdp_video_mixer_set_feature_enables(videoMixer, ARSIZE(feature), feature, enabled); +// VdpBool enabled[]={1,1,1}; +// vdp_st = vdp_video_mixer_set_feature_enables(videoMixer, ARSIZE(feature), feature, enabled); + if (vid_height <= 576){ + VdpBool enabled[]={1,1,0}; + vdp_st = vdp_video_mixer_set_feature_enables(videoMixer, ARSIZE(feature), feature, enabled); + } + else if (vid_height > 576){ + VdpBool enabled[]={1,0,0}; + vdp_st = vdp_video_mixer_set_feature_enables(videoMixer, ARSIZE(feature), feature, enabled); + dintFull = false; + } } else if (method == VS_INTERLACEMETHOD_VDPAU_TEMPORAL || method == VS_INTERLACEMETHOD_VDPAU_TEMPORAL_HALF) @@ -628,12 +629,12 @@ else if (method == VS_INTERLACEMETHOD_VDPAU_TEMPORAL_SPATIAL || method == VS_INTERLACEMETHOD_VDPAU_TEMPORAL_SPATIAL_HALF) { - VdpBool enabled[]={0,1,0}; + VdpBool enabled[]={1,1,0}; vdp_st = vdp_video_mixer_set_feature_enables(videoMixer, ARSIZE(feature), feature, enabled); } else if (method == VS_INTERLACEMETHOD_VDPAU_INVERSE_TELECINE) { - VdpBool enabled[]={0,0,1}; + VdpBool enabled[]={1,0,1}; vdp_st = vdp_video_mixer_set_feature_enables(videoMixer, ARSIZE(feature), feature, enabled); } else @@ -804,6 +805,8 @@ free(m_videoSurfaces[i]); } m_videoSurfaces.clear(); + while (!m_DVDVideoPics.empty()) + m_DVDVideoPics.pop(); } @@ -1151,24 +1154,43 @@ ClearUsedForRender(&past[0]); past[0] = past[1]; past[1] = current; - current = render; + current = future; + future = render; - if((method == VS_INTERLACEMETHOD_AUTO && pFrame->interlaced_frame) + DVDVideoPicture DVDPic; + memset(&DVDPic, 0, sizeof(DVDVideoPicture)); + ((CDVDVideoCodecFFmpeg*)avctx->opaque)->GetPictureCommon(&DVDPic); + m_DVDVideoPics.push(DVDPic); + + int pics = m_DVDVideoPics.size(); + if (pics < 2) + return VC_BUFFER; + else if (pics > 2) + { + // this should not normally happen + CLog::Log(LOGERROR, "CVDPAU::Decode - invalid number of pictures in queue"); + while (pics-- != 2) + m_DVDVideoPics.pop(); + } + + if((method == VS_INTERLACEMETHOD_AUTO && + m_DVDVideoPics.front().iFlags & DVP_FLAG_INTERLACED) || method == VS_INTERLACEMETHOD_VDPAU_BOB || method == VS_INTERLACEMETHOD_VDPAU_TEMPORAL || method == VS_INTERLACEMETHOD_VDPAU_TEMPORAL_HALF || method == VS_INTERLACEMETHOD_VDPAU_TEMPORAL_SPATIAL || method == VS_INTERLACEMETHOD_VDPAU_TEMPORAL_SPATIAL_HALF - || method == VS_INTERLACEMETHOD_VDPAU_INVERSE_TELECINE ) + || method == VS_INTERLACEMETHOD_VDPAU_INVERSE_TELECINE) { if(method == VS_INTERLACEMETHOD_VDPAU_TEMPORAL_HALF || method == VS_INTERLACEMETHOD_VDPAU_TEMPORAL_SPATIAL_HALF - || avctx->hurry_up) + || avctx->hurry_up + || dintFull == false) m_mixerstep = 0; else m_mixerstep = 1; - if(pFrame->top_field_first) + if(m_DVDVideoPics.front().iFlags & DVP_FLAG_TOP_FIELD_FIRST) m_mixerfield = VDP_VIDEO_MIXER_PICTURE_STRUCTURE_TOP_FIELD; else m_mixerfield = VDP_VIDEO_MIXER_PICTURE_STRUCTURE_BOTTOM_FIELD; @@ -1186,6 +1208,7 @@ if(avctx->hurry_up) { ClearUsedForRender(&past[1]); + m_DVDVideoPics.pop(); return VC_BUFFER; } @@ -1210,7 +1233,7 @@ past_surfaces[1] = past[0]->surface; if (past[1]) past_surfaces[0] = past[1]->surface; - futu_surfaces[0] = VDP_INVALID_HANDLE; + futu_surfaces[0] = future->surface; } else { @@ -1228,7 +1251,7 @@ if (past[1]) past_surfaces[1] = past[1]->surface; past_surfaces[0] = current->surface; - futu_surfaces[0] = VDP_INVALID_HANDLE; + futu_surfaces[0] = future->surface; } } @@ -1273,8 +1296,14 @@ bool CVDPAU::GetPicture(AVCodecContext* avctx, AVFrame* frame, DVDVideoPicture* picture) { + *picture = m_DVDVideoPics.front(); + // if this is the first field of an interlaced frame, we'll need + // this same picture for the second field later + if (m_mixerstep != 1) + m_DVDVideoPics.pop(); + picture->format = DVDVideoPicture::FMT_VDPAU; - picture->iFlags = 0; + picture->iFlags &= DVP_FLAG_DROPPED; picture->iWidth = OutWidth; picture->iHeight = OutHeight; picture->vdpau = this; @@ -1291,6 +1320,18 @@ return true; } +void CVDPAU::Reset() +{ + // invalidate surfaces and picture queue when seeking + ClearUsedForRender(&past[0]); + ClearUsedForRender(&past[1]); + ClearUsedForRender(¤t); + ClearUsedForRender(&future); + + while (!m_DVDVideoPics.empty()) + m_DVDVideoPics.pop(); +} + void CVDPAU::Present() { //CLog::Log(LOGNOTICE,"%s",__FUNCTION__); diff -Nru xbmc-pvr~10.08~svn35025/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.h xbmc-pvr~10.08~svn35177/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.h --- xbmc-pvr~10.08~svn35025/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.h 2010-10-26 20:31:19.000000000 +0000 +++ xbmc-pvr~10.08~svn35177/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.h 2010-11-05 20:50:38.000000000 +0000 @@ -30,6 +30,7 @@ #define GLX_GLXEXT_PROTOTYPES #include #include +#include #include "utils/CriticalSection.h" #include "settings/VideoSettings.h" namespace Surface { class CSurface; } @@ -65,6 +66,7 @@ virtual bool Open (AVCodecContext* avctx, const enum PixelFormat); virtual int Decode (AVCodecContext* avctx, AVFrame* frame); virtual bool GetPicture(AVCodecContext* avctx, AVFrame* frame, DVDVideoPicture* picture); + virtual void Reset(); virtual void Close(); virtual int Check(AVCodecContext* avctx) @@ -119,6 +121,7 @@ float tmpBrightness, tmpContrast; int OutWidth, OutHeight; bool upScale; + std::queue m_DVDVideoPics; static inline void ClearUsedForRender(vdpau_render_state **st) { @@ -204,6 +207,7 @@ int presentSurfaceNum; int totalAvailableOutputSurfaces; uint32_t vid_width, vid_height; + bool dintFull; uint32_t max_references; Display* m_Display; bool vdpauConfigured; diff -Nru xbmc-pvr~10.08~svn35025/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp xbmc-pvr~10.08~svn35177/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp --- xbmc-pvr~10.08~svn35025/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp 2010-08-07 11:43:35.000000000 +0000 +++ xbmc-pvr~10.08~svn35177/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp 2010-11-05 20:50:38.000000000 +0000 @@ -537,7 +537,7 @@ picture.iGroupId = pPacket->iGroupId; - if(picture.iDuration == 0) + if(picture.iDuration == 0.0) picture.iDuration = frametime; if(bPacketDrop) diff -Nru xbmc-pvr~10.08~svn35025/xbmc/lib/libPython/Python/Mac/IDE scripts/Hack/.svn/entries xbmc-pvr~10.08~svn35177/xbmc/lib/libPython/Python/Mac/IDE scripts/Hack/.svn/entries --- xbmc-pvr~10.08~svn35025/xbmc/lib/libPython/Python/Mac/IDE scripts/Hack/.svn/entries 2010-10-26 19:33:59.000000000 +0000 +++ xbmc-pvr~10.08~svn35177/xbmc/lib/libPython/Python/Mac/IDE scripts/Hack/.svn/entries 2010-11-05 20:41:49.000000000 +0000 @@ -1,7 +1,7 @@ 10 dir -35025 +35177 https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/pvr-testing2/xbmc/lib/libPython/Python/Mac/IDE%20scripts/Hack https://xbmc.svn.sourceforge.net/svnroot/xbmc diff -Nru xbmc-pvr~10.08~svn35025/xbmc/lib/libPython/Python/Mac/IDE scripts/.svn/entries xbmc-pvr~10.08~svn35177/xbmc/lib/libPython/Python/Mac/IDE scripts/.svn/entries --- xbmc-pvr~10.08~svn35025/xbmc/lib/libPython/Python/Mac/IDE scripts/.svn/entries 2010-10-26 19:33:59.000000000 +0000 +++ xbmc-pvr~10.08~svn35177/xbmc/lib/libPython/Python/Mac/IDE scripts/.svn/entries 2010-11-05 20:41:49.000000000 +0000 @@ -1,7 +1,7 @@ 10 dir -35025 +35177 https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/pvr-testing2/xbmc/lib/libPython/Python/Mac/IDE%20scripts https://xbmc.svn.sourceforge.net/svnroot/xbmc diff -Nru xbmc-pvr~10.08~svn35025/xbmc/lib/libPython/Python/Mac/IDE scripts/Widget demos/.svn/entries xbmc-pvr~10.08~svn35177/xbmc/lib/libPython/Python/Mac/IDE scripts/Widget demos/.svn/entries --- xbmc-pvr~10.08~svn35025/xbmc/lib/libPython/Python/Mac/IDE scripts/Widget demos/.svn/entries 2010-10-26 19:33:59.000000000 +0000 +++ xbmc-pvr~10.08~svn35177/xbmc/lib/libPython/Python/Mac/IDE scripts/Widget demos/.svn/entries 2010-11-05 20:41:49.000000000 +0000 @@ -1,7 +1,7 @@ 10 dir -35025 +35177 https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/pvr-testing2/xbmc/lib/libPython/Python/Mac/IDE%20scripts/Widget%20demos https://xbmc.svn.sourceforge.net/svnroot/xbmc diff -Nru xbmc-pvr~10.08~svn35025/xbmc/pvrclients/MediaPortal/Makefile xbmc-pvr~10.08~svn35177/xbmc/pvrclients/MediaPortal/Makefile --- xbmc-pvr~10.08~svn35025/xbmc/pvrclients/MediaPortal/Makefile 2010-08-17 21:05:43.000000000 +0000 +++ xbmc-pvr~10.08~svn35177/xbmc/pvrclients/MediaPortal/Makefile 2010-11-05 20:41:42.000000000 +0000 @@ -50,7 +50,7 @@ # The main library: $(LIB): $(OBJS) $(SILIB) - $(CXX) $(CXXFLAGS) -shared -g $(OBJS) $(LIBS) $(LIBDIRS) $(SILIB) -o $(LIB) + $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -g $(OBJS) $(LIBS) $(LIBDIRS) $(SILIB) -o $(LIB) # Install the files: diff -Nru xbmc-pvr~10.08~svn35025/xbmc/pvrclients/mythtv/Makefile.in xbmc-pvr~10.08~svn35177/xbmc/pvrclients/mythtv/Makefile.in --- xbmc-pvr~10.08~svn35025/xbmc/pvrclients/mythtv/Makefile.in 2010-10-25 20:31:26.000000000 +0000 +++ xbmc-pvr~10.08~svn35177/xbmc/pvrclients/mythtv/Makefile.in 2010-11-05 20:41:45.000000000 +0000 @@ -52,7 +52,7 @@ $(LIB): $(OBJS) $(SILIB) $(MAKE) -C libmythxml - $(CXX) $(CXXFLAGS) -shared -g $(OBJS) $(LIBS) $(LIBDIRS) $(SILIB) -o $(LIB) + $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -g $(OBJS) $(LIBS) $(LIBDIRS) $(SILIB) -o $(LIB) # Install the files: diff -Nru xbmc-pvr~10.08~svn35025/xbmc/pvrclients/tvheadend/Makefile xbmc-pvr~10.08~svn35177/xbmc/pvrclients/tvheadend/Makefile --- xbmc-pvr~10.08~svn35025/xbmc/pvrclients/tvheadend/Makefile 2010-08-17 21:05:44.000000000 +0000 +++ xbmc-pvr~10.08~svn35177/xbmc/pvrclients/tvheadend/Makefile 2010-11-05 20:41:43.000000000 +0000 @@ -53,7 +53,7 @@ $(LIB): $(OBJS) $(SILIB) $(MAKE) -C libhts - $(CXX) $(CXXFLAGS) -shared -g $(OBJS) $(LIBS) $(LIBDIRS) $(SILIB) -o $(LIB) + $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -g $(OBJS) $(LIBS) $(LIBDIRS) $(SILIB) -o $(LIB) # Install the files: diff -Nru xbmc-pvr~10.08~svn35025/xbmc/pvrclients/vdr-streamdev/Makefile.in xbmc-pvr~10.08~svn35177/xbmc/pvrclients/vdr-streamdev/Makefile.in --- xbmc-pvr~10.08~svn35025/xbmc/pvrclients/vdr-streamdev/Makefile.in 2010-08-17 21:05:44.000000000 +0000 +++ xbmc-pvr~10.08~svn35177/xbmc/pvrclients/vdr-streamdev/Makefile.in 2010-11-05 20:41:44.000000000 +0000 @@ -51,7 +51,7 @@ # The main library: $(LIB): $(OBJS) $(SILIB) - $(CXX) $(CXXFLAGS) -shared -g $(OBJS) $(LIBS) $(LIBDIRS) $(SILIB) -o $(LIB) + $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -g $(OBJS) $(LIBS) $(LIBDIRS) $(SILIB) -o $(LIB) # Install the files: diff -Nru xbmc-pvr~10.08~svn35025/xbmc/pvrclients/vdr-vnsi/Makefile xbmc-pvr~10.08~svn35177/xbmc/pvrclients/vdr-vnsi/Makefile --- xbmc-pvr~10.08~svn35025/xbmc/pvrclients/vdr-vnsi/Makefile 2010-08-17 21:05:44.000000000 +0000 +++ xbmc-pvr~10.08~svn35177/xbmc/pvrclients/vdr-vnsi/Makefile 2010-11-05 20:41:45.000000000 +0000 @@ -53,7 +53,7 @@ # The main library: $(LIB): $(OBJS) $(SILIB) - $(CXX) $(CXXFLAGS) -shared -g $(OBJS) $(LIBS) $(LIBDIRS) $(SILIB) -o $(LIB) + $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -g $(OBJS) $(LIBS) $(LIBDIRS) $(SILIB) -o $(LIB) # Install the files: