1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
|
diff -Nur Jubler-3.9.0/build.xml Jubler-3.9.0_patched/build.xml
--- Jubler-3.9.0/build.xml 2008-05-14 16:13:30.000000000 +0300
+++ Jubler-3.9.0_patched/build.xml 2008-05-24 11:58:56.000000000 +0300
@@ -69,22 +69,6 @@
- <!-- Define new ant tasks -->
-
- <taskdef name="izpack"
- onerror="report"
- classpath="../TOOLS/IzPack/standalone-compiler.jar"
- classname="com.izforge.izpack.ant.IzPackTask"/>
-
- <taskdef name="launch4j"
- onerror="report"
- classpath="../TOOLS/launch4j/launch4j.jar:../TOOLS/launch4j/lib/xstream.jar"
- classname="net.sf.launch4j.ant.Launch4jTask"/>
-
- <taskdef name="jarbundler"
- onerror="report"
- classpath="../TOOLS/jarbundler/jarbundler-1.9.jar"
- classname="net.sourceforge.jarbundler.JarBundler" />
@@ -397,9 +381,6 @@
- <target name="-pre-compile">
- <copy todir="src/com"> <fileset dir="resources/system/no_mac"/> </copy>
- </target>
<target name="-post-compile">
<delete dir="build/classes/com/apple" failonerror="false"/>
<delete dir="src/com/apple" failonerror="false"/>
diff -Nur Jubler-3.9.0/resources/ffdecode/Makefile Jubler-3.9.0_patched/resources/ffdecode/Makefile
--- Jubler-3.9.0/resources/ffdecode/Makefile 2008-03-18 00:01:03.000000000 +0200
+++ Jubler-3.9.0_patched/resources/ffdecode/Makefile 2008-05-24 12:00:50.000000000 +0300
@@ -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}
@@ -106,7 +103,6 @@
CCPREF_NOS=${shell echo ${CCPREF} | sed -e 's/-$$//g' }
DCONFIG=--with-mp4v2 --host=${CCPREF_NOS}
-CC=${CCPREF}gcc
RANLIB=${CCPREF}ranlib
@@ -115,7 +111,7 @@
.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
@@ -157,7 +153,6 @@
${LIBNAME}:${LIBRARYREQ} ${OBJS} ${RANLIBREQ}
${LD} ${GCCOPTS} -o ${LIBNAME} ${OBJS} ${LIBS}
- ${STRIP} ${LIBNAME}
clean:
diff -Nur Jubler-3.9.0/src/com/panayotis/jubler/information/HelpBrowser.java Jubler-3.9.0_patched/src/com/panayotis/jubler/information/HelpBrowser.java
--- Jubler-3.9.0/src/com/panayotis/jubler/information/HelpBrowser.java 2008-03-30 23:04:05.000000000 +0300
+++ Jubler-3.9.0_patched/src/com/panayotis/jubler/information/HelpBrowser.java 2008-05-24 11:58:56.000000000 +0300
@@ -47,7 +47,7 @@
history = new ArrayList<String>();
- 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-3.9.0/src/com/panayotis/jubler/Main.java Jubler-3.9.0_patched/src/com/panayotis/jubler/Main.java
--- Jubler-3.9.0/src/com/panayotis/jubler/Main.java 2008-03-30 23:04:08.000000000 +0300
+++ Jubler-3.9.0_patched/src/com/panayotis/jubler/Main.java 2008-05-24 11:58:56.000000000 +0300
@@ -84,17 +84,9 @@
/* Load arguments, in a mac way */
SystemDependent.initApplication();
- /* Check current version in a new thread */
- Thread versioncheck = new Thread() {
- public void run() {
- StaticJubler.initVersion();
- }
- };
-
new Jubler(); // Display initial Jubler window
splash.dispose(); // Hide splash screen
loader.start(); // initialize loader
- versioncheck.start();
}
diff -Nur Jubler-3.9.0/src/com/panayotis/jubler/os/SystemDependent.java Jubler-3.9.0_patched/src/com/panayotis/jubler/os/SystemDependent.java
--- Jubler-3.9.0/src/com/panayotis/jubler/os/SystemDependent.java 2008-03-31 02:00:49.000000000 +0300
+++ Jubler-3.9.0_patched/src/com/panayotis/jubler/os/SystemDependent.java 2008-05-24 11:58:56.000000000 +0300
@@ -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;
@@ -110,10 +106,6 @@
public static void initApplication() {
- /* In Linux this is a dummy function */
- if (isMacOSX()) {
- JublerApp japp = new JublerApp();
- }
}
@@ -328,36 +320,3 @@
return home+".jubler/output.log";
}
}
-
-
-
-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) {
- StaticJubler.quitAll();
- event.setHandled(false);
- }
-
- public void handleOpenFile(ApplicationEvent event) {
- Main.asyncAddSubtitle(event.getFilename());
- }
-}
diff -Nur Jubler-3.9.0/src/com/panayotis/jubler/os/SystemFileFinder.java Jubler-3.9.0_patched/src/com/panayotis/jubler/os/SystemFileFinder.java
--- Jubler-3.9.0/src/com/panayotis/jubler/os/SystemFileFinder.java 2008-03-30 23:04:04.000000000 +0300
+++ Jubler-3.9.0_patched/src/com/panayotis/jubler/os/SystemFileFinder.java 2008-05-24 11:58:56.000000000 +0300
@@ -58,15 +58,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;
}
|
GitWeb