diff options
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | misc/cdda_server.c | 10 | ||||
| -rw-r--r-- | src/input/input_dvd.c | 11 | ||||
| -rw-r--r-- | src/input/libdvdnav/dvd_input.c | 10 |
4 files changed, 22 insertions, 13 deletions
diff --git a/configure.ac b/configure.ac index 98423a5cd..abfc9bf27 100644 --- a/configure.ac +++ b/configure.ac @@ -1991,8 +1991,8 @@ case "$host_or_hostalias" in if test x$enable_altivec != xno; then AC_DEFINE_UNQUOTED(ENABLE_ALTIVEC,,[Define this if you want to use altivec on PowerPC CPUs]) - CFLAGS="$CFLAGS -faltivec" - LIBMPEG2_CFLAGS="$LIBMPEG2_CFLAGS -force_cpusubtype_ALL -faltivec" + CFLAGS="$CFLAGS -faltivec -maltivec" + LIBMPEG2_CFLAGS="$LIBMPEG2_CFLAGS -force_cpusubtype_ALL -faltivec -maltivec" fi ;; ppc-*-linux* | powerpc-*) diff --git a/misc/cdda_server.c b/misc/cdda_server.c index 6c3eb0a6b..c4b3f44cb 100644 --- a/misc/cdda_server.c +++ b/misc/cdda_server.c @@ -335,10 +335,12 @@ int dvdinput_setup(void) /* dlopening libdvdcss */ -#ifndef _MSC_VER - dvdcss_library = dlopen("libdvdcss.so.2", RTLD_LAZY); -#else +#ifdef HOST_OS_DARWIN + dvdcss_library = dlopen("libdvdcss.2.dylib", RTLD_LAZY); +#elif defined(WIN32) dvdcss_library = dlopen("libdvdcss.dll", RTLD_LAZY); +#else + dvdcss_library = dlopen("libdvdcss.so.2", RTLD_LAZY); #endif if(dvdcss_library != NULL) { @@ -371,7 +373,7 @@ int dvdinput_setup(void) dvdcss_library = NULL; } else if(!dvd_open || !dvd_close || !dvd_title || !dvd_seek || !dvd_read || !dvd_error || !dvdcss_version) { - fprintf(stderr, "libdvdread: Missing symbols in libdvdcss.so.2, " + fprintf(stderr, "libdvdread: Missing symbols in libdvdcss, " "this shouldn't happen !\n"); dlclose(dvdcss_library); } diff --git a/src/input/input_dvd.c b/src/input/input_dvd.c index eaf60f473..13f88c3d6 100644 --- a/src/input/input_dvd.c +++ b/src/input/input_dvd.c @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: input_dvd.c,v 1.208 2006/07/10 22:08:15 dgp85 Exp $ + * $Id: input_dvd.c,v 1.209 2006/07/11 03:22:59 dgp85 Exp $ * */ @@ -1783,8 +1783,13 @@ static void *init_class (xine_t *xine, void *data) { _("The path to the device, usually a " "DVD drive, which you intend to use for playing DVDs."), 10, device_change_cb, (void *)this); - - if ((dvdcss = dlopen("libdvdcss.so.2", RTLD_LAZY)) != NULL) { + +#ifdef HOST_OS_DARWIN + if ((dvdcss = dlopen("libdvdcss.2.dylib", RTLD_LAZY)) != NULL) +#else + if ((dvdcss = dlopen("libdvdcss.so.2", RTLD_LAZY)) != NULL) +#endif + { /* we have found libdvdcss, enable the specific config options */ char *raw_device; static char *decrypt_modes[] = { "key", "disc", "title", NULL }; diff --git a/src/input/libdvdnav/dvd_input.c b/src/input/libdvdnav/dvd_input.c index 6e8dbd8d0..6b7bcaeab 100644 --- a/src/input/libdvdnav/dvd_input.c +++ b/src/input/libdvdnav/dvd_input.c @@ -364,10 +364,12 @@ int dvdinput_setup(void) #else /* dlopening libdvdcss */ -#ifndef WIN32 - dvdcss_library = dlopen("libdvdcss.so.2", RTLD_LAZY); -#else +#ifdef HOST_OS_DARWIN + dvdcss_library = dlopen("libdvdcss.2.dylib", RTLD_LAZY); +#elif defined(WIN32) dvdcss_library = dlopen("libdvdcss.dll", RTLD_LAZY); +#else + dvdcss_library = dlopen("libdvdcss.so.2", RTLD_LAZY); #endif if(dvdcss_library != NULL) { @@ -400,7 +402,7 @@ int dvdinput_setup(void) dvdcss_library = NULL; } else if(!DVDcss_open || !DVDcss_close || !DVDcss_title || !DVDcss_seek || !DVDcss_read || !DVDcss_error || !dvdcss_version) { - fprintf(stderr, "libdvdread: Missing symbols in libdvdcss.so.2, " + fprintf(stderr, "libdvdread: Missing symbols in libdvdcss, " "this shouldn't happen !\n"); dlclose(dvdcss_library); } |