From kde-core-devel Tue Aug 29 21:58:08 2000 From: Alex Zepeda Date: Tue, 29 Aug 2000 21:58:08 +0000 To: kde-core-devel Subject: Re: mpeglib cdrom patch.... X-MARC-Message: https://marc.info/?l=kde-core-devel&m=96758688830106 MIME-Version: 1 Content-Type: multipart/mixed; boundary="--gKMricLos+KVdGMg" --gKMricLos+KVdGMg Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Tue, Aug 29, 2000 at 01:25:22PM +0200, Martin Vogt wrote: > > Hi, > > >Here's a small patch to correct the including of the Linux specific bits > >on BSDs that I'd like to commit.... > > mpeglib is not build on *BSD anyway, but you can commit > the patch. Actually, it *DOES* build if you correctly don't include the Linux specific bits. And a quick patch to configure.in.in should work as well. See attached patch. It compiles and works as well as can be expected. Except that artsplug doesn't compile at all for me. See other attachment. - alex --gKMricLos+KVdGMg Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="mpeglib.patch" Index: configure.in.in =================================================================== RCS file: /home/kde/kdemultimedia/mpeglib/configure.in.in,v retrieving revision 1.3 diff -c -r1.3 configure.in.in *** configure.in.in 2000/08/22 01:53:59 1.3 --- configure.in.in 2000/08/29 21:56:49 *************** *** 24,30 **** dnl Checks for header files. - AC_CHECK_HEADERS(pthread.h pthread/mit/pthread.h) AC_CHECK_HEADERS(sys/soundcard.h machine/soundcard.h linux/soundcard.h) --- 24,29 ---- *************** *** 134,197 **** AIX) kde_mpeglib_compiles=yes ;; - *) - AC_MSG_RESULT([*** We disable mpeglib for this platform ***]) - DO_NOT_COMPILE="$DO_NOT_COMPILE mpeglib" - ;; - - esac - - - - case "$OS_TYPE" in - AIX) - AC_MSG_RESULT([AIX :Unknown hardware. You will have problems!!]) - AC_CHECK_LIB(pthread, pthread_create, [LIBPTHREAD="-lpthread"]) - AC_DEFINE(OS_AIX,1,[Define if you have AIX for sound]) - ;; - - Linux) - AC_CHECK_LIB(pthread, pthread_create, [LIBPTHREAD="-lpthread"]) - AC_DEFINE(OS_Linux,1,[Define if you have linux pthread]) - ;; - FreeBSD) ! OS_TYPE="BSD" ! AC_CHECK_LIB(c_r, pthread_create, [LIBPTHREAD="-lc_r"]) dnl name of pthread lib in FreeBSD ! AC_DEFINE(OS_BSD,1,[Define if you have BSD pthread in -lc_r]) ! ;; ! ! BSD/OS) ! OS_TYPE="BSD" ! AC_DEFINE(OS_BSD,1,[Define if you have BSD pthread in -lc_r]) ! ;; ! ! NetBSD) ! AC_MSG_RESULT([NetBSD :Unknown hardware. You will have problems!!]) ! OS_TYPE="BSD" ! AC_DEFINE(OS_BSD,1,[Define if you have BSD pthread in -lc_r]) ! ;; ! ! SunOS) ! OS_TYPE="SunOS" ! AC_CHECK_LIB(pthread, pthread_create, [LIBPTHREAD="-lpthread"]) ! AC_DEFINE(OS_SunOS,1,[Define if you have solaris -lpthread]) ! ;; ! ! IRIX) ! AC_MSG_RESULT([IRIX :Unknown hardware. You will have problems!!]) ! AC_DEFINE(OS_IRIX,1,[Define if you have iris]) ! ;; ! ! HPUX) ! AC_MSG_RESULT([HPUX :Unknown hardware. You will have problems!!]) ! AC_DEFINE(OS_HPUX,1,[Define if you have HP_UX]) ;; - *) ! AC_MSG_RESULT([Very Unknown hardware. **Better give up!**]) ;; esac ! AC_SUBST(LIBPTHREAD) --- 133,146 ---- AIX) kde_mpeglib_compiles=yes ;; FreeBSD) ! kde_mpeglib_compiles=yes ;; *) ! AC_MSG_RESULT([*** We disable mpeglib for this platform ***]) ! DO_NOT_COMPILE="$DO_NOT_COMPILE mpeglib" ;; esac ! KDE_CHECK_THREADING --gKMricLos+KVdGMg Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="artsplug.output" gmake[1]: Entering directory `/usr/home/alex/cvs/kde-cvs/kdemultimedia/obj-i386/mpeglib_artsplug' /bin/sh ../libtool --mode=compile g++ -DHAVE_CONFIG_H -I. -I../../mpeglib_artsplug -I.. -I/usr/local/kde/include -I/usr/local/qt/include -I/usr/X11R6/include -I../mpeglib/lib -I/usr/local/kde/include/artsc -I/usr/local/kde/include/artsc/../arts -I/include -gstabs3 -Wall -W -ansi -pedantic -pipe -DQT_CLEAN_NAMESPACE -DQT_NO_COMPAT -DQT_NO_ASCII_CAST -c decoderBaseObject.cc mkdir .libs g++ -DHAVE_CONFIG_H -I. -I../../mpeglib_artsplug -I.. -I/usr/local/kde/include -I/usr/local/qt/include -I/usr/X11R6/include -I../mpeglib/lib -I/usr/local/kde/include/artsc -I/usr/local/kde/include/artsc/../arts -I/include -gstabs3 -Wall -W -ansi -pedantic -pipe -DQT_CLEAN_NAMESPACE -DQT_NO_COMPAT -DQT_NO_ASCII_CAST -Wp,-MD,.deps/decoderBaseObject.pp -c decoderBaseObject.cc -fPIC -DPIC -o .libs/decoderBaseObject.o /bin/sh ../libtool --mode=compile g++ -DHAVE_CONFIG_H -I. -I../../mpeglib_artsplug -I.. -I/usr/local/kde/include -I/usr/local/qt/include -I/usr/X11R6/include -I../mpeglib/lib -I/usr/local/kde/include/artsc -I/usr/local/kde/include/artsc/../arts -I/include -gstabs3 -Wall -W -ansi -pedantic -pipe -DQT_CLEAN_NAMESPACE -DQT_NO_COMPAT -DQT_NO_ASCII_CAST -c ../../mpeglib_artsplug/oggPlayObject_impl.cpp g++ -DHAVE_CONFIG_H -I. -I../../mpeglib_artsplug -I.. -I/usr/local/kde/include -I/usr/local/qt/include -I/usr/X11R6/include -I../mpeglib/lib -I/usr/local/kde/include/artsc -I/usr/local/kde/include/artsc/../arts -I/include -gstabs3 -Wall -W -ansi -pedantic -pipe -DQT_CLEAN_NAMESPACE -DQT_NO_COMPAT -DQT_NO_ASCII_CAST -Wp,-MD,.deps/oggPlayObject_impl.pp -c ../../mpeglib_artsplug/oggPlayObject_impl.cpp -fPIC -DPIC -o .libs/oggPlayObject_impl.o In file included from ../../mpeglib_artsplug/oggPlayObject_impl.h:18, from ../../mpeglib_artsplug/oggPlayObject_impl.cpp:16: ../../mpeglib_artsplug/decoderBaseObject_impl.h:93: `class vector,__default_alloc_template >,allocator,__default_alloc_template > > > Arts::SynthModule_base::_defaultPortsIn() const' needs a final overrider ../../mpeglib_artsplug/decoderBaseObject_impl.h:93: `class vector,__default_alloc_template >,allocator,__default_alloc_template > > > Arts::SynthModule_base::_defaultPortsOut() const' needs a final overrider ../../mpeglib_artsplug/decoderBaseObject_impl.h:93: `void * Arts::SynthModule_base::_cast(long unsigned int)' needs a final overrider ../../mpeglib_artsplug/oggPlayObject_impl.cpp: In method `class DecoderPlugin * OGGPlayObject_impl::createPlugin()': ../../mpeglib_artsplug/oggPlayObject_impl.cpp:55: warning: assignment to `char *' from `const char *' discards qualifiers gmake[1]: *** [oggPlayObject_impl.lo] Error 1 gmake[1]: Leaving directory `/usr/home/alex/cvs/kde-cvs/kdemultimedia/obj-i386/mpeglib_artsplug' gmake: *** [all-recursive] Error 1 --gKMricLos+KVdGMg--