diff -Nur Jubler-4.0/build.xml Jubler-4.0_patched/build.xml --- Jubler-4.0/build.xml 2008-12-11 12:33:50.000000000 +0200 +++ Jubler-4.0_patched/build.xml 2008-12-20 03:14:59.000000000 +0200 @@ -69,25 +69,6 @@ - - - - - - - - - - @@ -430,9 +411,6 @@ - - - diff -Nur Jubler-4.0/resources/ffdecode/Makefile Jubler-4.0_patched/resources/ffdecode/Makefile --- Jubler-4.0/resources/ffdecode/Makefile 2008-12-08 11:16:13.000000000 +0200 +++ Jubler-4.0_patched/resources/ffdecode/Makefile 2008-12-20 04:50:48.000000000 +0200 @@ -12,9 +12,6 @@ # Name of the produced library PROJ=ffdecode -# Paths of include files -JAVA_HOME=${shell /bin/sh ../system/findjava.sh -j} - # Current Path CPATH=${shell pwd} @@ -39,7 +36,6 @@ # Various options FFCONF=configure LIBSUF=_${SYSTEM}.${ARCH} -MAKEOPTS=-j3 # Find requested files NATIVES=${shell cd ../../src && grep -r ' native ' * | grep -v '/.svn/' | gawk -F ':' '{print $$1}' | uniq | sed -e 's/\.java$$//g' | tr '/' '.' } @@ -106,7 +102,6 @@ CCPREF_NOS=${shell echo ${CCPREF} | sed -e 's/-$$//g' } DCONFIG=--with-mp4v2 --host=${CCPREF_NOS} -CC=${CCPREF}gcc RANLIB=${CCPREF}ranlib ifeq (${NOSTRIP},) @@ -121,35 +116,35 @@ .SUFFIXES:.o .c .c.o: - ${CC} ${CFLAGS} ${GCCOPTS} -std=c99 -pedantic -O3 -Wall ${INCS} -I${JAVA_HOME}/include -I${JAVA_HOME}/include/${SYSTEM} -c -o $@ $? + ${CC} ${CFLAGS} ${GCCOPTS} -std=c99 -pedantic -Wall ${INCS} -I${JAVA_HOME}/include -I${JAVA_HOME}/include/${SYSTEM} -c -o $@ $? develop:javacheck - make -e `uname -s|tr [A-Z] [a-z]` + $(MAKE) -e `uname -s|tr [A-Z] [a-z]` linux:javacheck distclean - make -e library MAKESYS=linux + $(MAKE) -e library MAKESYS=linux rm -rf ${JUBLER}/src/lib linuxdyn:javacheck distclean - make -e library MAKESYS=linux STATIC=no + $(MAKE) -e library MAKESYS=linux STATIC=no rm -rf ${Jubler}/src/lib win32:javacheck distclean - make -e library MAKESYS=win32 + $(MAKE) -e library MAKESYS=win32 rm -rf ${JUBLER}/src/lib darwin:javacheck - make distclean - make -e LIB MAKESYS=darwin_ppc - make distclean - make -e LIB MAKESYS=darwin_i386 - make distclean + $(MAKE) distclean + $(MAKE) -e LIB MAKESYS=darwin_ppc + $(MAKE) distclean + $(MAKE) -e LIB MAKESYS=darwin_i386 + $(MAKE) distclean lipo ${PROJ}.ppc ${PROJ}.i386 -create -output ${MACLIBNAME} TIGER=`otool -vR ${MACLIBNAME} | grep UNIX` ; if [ -n "$$TIGER" ] ; then echo "Tiger compatibility problem!" ; echo $$TIGER ; exit 1 ; fi rm -f ${PROJ}.ppc ${PROJ}.i386 - make -e libinstall LIBNAME=${MACLIBNAME} + $(MAKE) -e libinstall LIBNAME=${MACLIBNAME} library:clean ${LIBNAME} libinstall @@ -190,19 +185,19 @@ ${LIBRARIES}/libfaad${LIBSUF}.a: - cd ${FAAD} && CFLAGS="${GCCOPTS}" LDFLAGS="${GCCOPTS}" ./configure ${DCONFIG} && mv frontend/Makefile frontend/Makefile.orig && echo >frontend/Makefile "all:" && make -j3 + cd ${FAAD} && CFLAGS="${GCCOPTS}" LDFLAGS="${GCCOPTS}" ./configure ${DCONFIG} && mv frontend/Makefile frontend/Makefile.orig && echo >frontend/Makefile "all:" && $(MAKE) -j3 mkdir -p ${LIBRARIES} cp ${FAAD}/libfaad/.libs/libfaad.a ${LIBRARIES}/libfaad${LIBSUF}.a - cd ${FAAD} && mv frontend/Makefile.orig frontend/Makefile && make distclean + cd ${FAAD} && mv frontend/Makefile.orig frontend/Makefile && $(MAKE) distclean ${LIBRARYREQ}: ${LIBRARIES}/libfaad${LIBSUF}.a mkdir -p ${LIBRARIES} cd ${LIBRARIES} ; rm -f libfaad.a && ln -s libfaad${LIBSUF}.a libfaad.a - cd ${FFMPEG} && ./${FFCONF} ${FCONFIG} && make -j3 + cd ${FFMPEG} && ./${FFCONF} ${FCONFIG} && $(MAKE) -j3 cp ${FFMPEG}/libavformat/libavformat.a ${LIBRARIES}/libavformat${LIBSUF}.a cp ${FFMPEG}/libavcodec/libavcodec.a ${LIBRARIES}/libavcodec${LIBSUF}.a cp ${FFMPEG}/libavutil/libavutil.a ${LIBRARIES}/libavutil${LIBSUF}.a - cd ${FFMPEG} && make distclean + cd ${FFMPEG} && $(MAKE) distclean rm -f ${LIBRARIES}/libfaad.a diff -Nur Jubler-4.0/src/com/panayotis/jubler/information/HelpBrowser.java Jubler-4.0_patched/src/com/panayotis/jubler/information/HelpBrowser.java --- Jubler-4.0/src/com/panayotis/jubler/information/HelpBrowser.java 2008-11-29 17:13:57.000000000 +0200 +++ Jubler-4.0_patched/src/com/panayotis/jubler/information/HelpBrowser.java 2008-12-20 02:49:14.000000000 +0200 @@ -47,7 +47,7 @@ history = new ArrayList(); - String initpage = "file:"+SystemFileFinder.getJublerAppPath()+"/help/jubler-faq.html"; + String initpage = "file:"+SystemFileFinder.getJublerAppPath()+"/../help/jubler-faq.html"; setPage(initpage); history.add(initpage); diff -Nur Jubler-4.0/src/com/panayotis/jubler/os/SystemDependent.java Jubler-4.0_patched/src/com/panayotis/jubler/os/SystemDependent.java --- Jubler-4.0/src/com/panayotis/jubler/os/SystemDependent.java 2008-11-29 17:13:57.000000000 +0200 +++ Jubler-4.0_patched/src/com/panayotis/jubler/os/SystemDependent.java 2008-12-20 02:50:17.000000000 +0200 @@ -25,10 +25,6 @@ import static com.panayotis.jubler.i18n.I18N._; -import com.apple.eawt.Application; -import com.apple.eawt.ApplicationAdapter; -import com.apple.eawt.ApplicationEvent; - import com.panayotis.jubler.Jubler; import com.panayotis.jubler.Main; import com.panayotis.jubler.StaticJubler; @@ -108,10 +104,6 @@ public static void initApplication() { - /* In Linux this is a dummy function */ - if (IS_MACOSX) { - JublerApp japp = new JublerApp(); - } } @@ -338,36 +330,3 @@ } } - - -class JublerApp extends Application { - public JublerApp() { - setEnabledPreferencesMenu(true); - addApplicationListener(new ApplicationHandler()); - } -} - -class ApplicationHandler extends ApplicationAdapter { - - public ApplicationHandler() {} - - public void handleAbout(ApplicationEvent event) { - StaticJubler.showAbout(); - event.setHandled(true); - } - - public void handlePreferences(ApplicationEvent event) { - Jubler.prefs.showPreferencesDialog(); - event.setHandled(true); - } - - public void handleQuit(ApplicationEvent event) { - if (StaticJubler.requestQuit(null)) - System.exit(0); - event.setHandled(false); - } - - public void handleOpenFile(ApplicationEvent event) { - Main.asyncAddSubtitle(event.getFilename()); - } -} diff -Nur Jubler-4.0/src/com/panayotis/jubler/os/SystemFileFinder.java Jubler-4.0_patched/src/com/panayotis/jubler/os/SystemFileFinder.java --- Jubler-4.0/src/com/panayotis/jubler/os/SystemFileFinder.java 2008-11-29 17:13:57.000000000 +0200 +++ Jubler-4.0_patched/src/com/panayotis/jubler/os/SystemFileFinder.java 2008-12-20 02:51:03.000000000 +0200 @@ -56,15 +56,12 @@ } public static boolean loadLibrary(String name) { - File libfile = findFile("lib"+pathseparator+System.mapLibraryName(name)); - if (libfile!=null) { try { - System.load(libfile.getAbsolutePath()); + System.loadLibrary(name); return true; } catch (UnsatisfiedLinkError e) { e.printStackTrace(); } - } return false; }