* added DJ's 10.2-patch again. Fixes the compilation of libcddb on the xserve.

* macosx.m: renamed "Stretch Aspect ratio" to "Stretch video to fill window" to make the option's meaning a bit more clear (thanks to Jonas for the hint)

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 5801473488e0da1ceaf8fb8c4e6bee6c6aa2e1e0..dd45746822da0d716e52b59a58aff4999bc03f28 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -1014,6 +1014,7 @@ libcddb-$(CDDB_VERSION).tar.gz:
 
 libcddb: libcddb-$(CDDB_VERSION).tar.gz
        $(EXTRACT_GZ)
+       patch -p 0 < Patches/libcddb.patch
 
 .cddb: libcddb
        (cd $<; ./configure --prefix=$(PREFIX) --disable-shared --enable-static CFLAGS="$(CFLAGS) -D_BSD_SOCKLEN_T_=int" LDFLAGS="$(LDFLAGS) -liconv" && make && make install)

diff --git a/extras/contrib/src/Patches/libcddb.patch b/extras/contrib/src/Patches/libcddb.patch
new file mode 100644 (file)
index 0000000..52bc559
--- /dev/null
+++ b/extras/contrib/src/Patches/libcddb.patch
@@ -0,0 +1,13 @@
+diff -ruN libcddb.orig/include/cddb/cddb_regex.h libcddb/include/cddb/cddb_regex.h
+--- libcddb.orig/include/cddb/cddb_regex.h     Fri Oct 15 21:42:08 2004
++++ libcddb/include/cddb/cddb_regex.h  Tue Jan 18 01:57:50 2005
+@@ -30,9 +30,7 @@
+ #include <cddb/cddb_config.h>
+ #include <stdlib.h>
+ 
+-#ifdef CDDB_NEED_UNISTD_H
+ #include <unistd.h>
+-#endif
+ #include <regex.h>
+ 
+ /**

diff --git a/modules/gui/macosx/macosx.m b/modules/gui/macosx/macosx.m
index 4dd2c1c18dcb3d030c2ea66fe49dc516d82ac8f6..17781bcc7f136c5ba32cfcc4013272d7bb9675a8 100644 (file)
--- a/modules/gui/macosx/macosx.m
+++ b/modules/gui/macosx/macosx.m
@@ -57,7 +57,7 @@ void E_(CloseVideoGL) ( vlc_object_t * );
     "Set the transparency of the video output. 1 is non-transparent (default) " \
     "0 is fully transparent.")
     
-#define STRETCH_TEXT N_("Stretch Aspect Ratio")
+#define STRETCH_TEXT N_("Stretch video to fill window")
 #define STRETCH_LONGTEXT N_("Instead of keeping the aspect ratio " \
         "of the movie when resizing the video, stretch the video " \
         "to fill the entire window." )