miguel.horta/commandergenius
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Vice: updated to new sources by Lubomyr

Browse Source
This commit is contained in:
Sergii Pylypenko
2015-08-03 21:04:58 +03:00
parent e38937b7c8
commit 52ba90aba5
11 changed files with 7 additions and 710 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@@ -62,3 +62,6 @@
[submodule "project/jni/vncserver/src"]
path = project/jni/vncserver/src
url = git@github.com:LibVNC/libvncserver.git
[submodule "project/jni/application/vice/vice"]
path = project/jni/application/vice/vice
url = git@github.com:lubomyr/vice-2.4.git

6
project/jni/application/vice/.gitignore vendored
View File

@@ -1,6 +0,0 @@
vice
vice-v7a
demos
games
list.txt
vice*.tar.gz

60
project/jni/application/vice/AndroidAppSettings.cfg
View File

File diff suppressed because one or more lines are too long

1
project/jni/application/vice/AndroidAppSettings.cfg Symbolic link
View File

@@ -0,0 +1 @@
vice/Android/vice/AndroidAppSettings.cfg

35
project/jni/application/vice/AndroidBuild.sh
View File

@@ -1,35 +0,0 @@
#!/bin/sh
LOCAL_PATH=`dirname $0`
LOCAL_PATH=`cd $LOCAL_PATH && pwd`
ln -sf libsdl-1.2.so $LOCAL_PATH/../../../obj/local/armeabi/libSDL.so
ln -sf libsdl-1.2.so $LOCAL_PATH/../../../obj/local/armeabi-v7a/libSDL.so
if [ "$1" = armeabi ]; then
if [ \! -f vice/configure ] ; then
sh -c "cd vice && ./autogen.sh"
fi
if [ \! -f vice/Makefile ] ; then
../setEnvironment.sh sh -c 'cd vice && env toolchain_check=no LIBS='-lsupc++' ./configure --host=arm-linux-androideabi --prefix=. --without-x --enable-sdlui --with-sdlsound --with-resid --without-residfp --disable-ffmpeg'
fi
make -C vice -j4 && mv -f vice/src/x64 libapplication.so || exit 1
else
if [ \! -f vice-v7a/configure ] ; then
sh -c "cd vice-v7a && ./autogen.sh"
fi
if [ \! -f vice-v7a/Makefile ] ; then
../setEnvironment-armeabi-v7a.sh sh -c 'cd vice-v7a && env toolchain_check=no LIBS="-lsupc++" ac_cv_sizeof_int=4 ./configure --host=arm-linux-androideabi --prefix=. --without-x --enable-sdlui --with-sdlsound --without-resid --with-residfp --disable-ffmpeg' && \
../setEnvironment-armeabi-v7a.sh sh -c 'sed -i "s@^CXXFLAGS =.*@CXXFLAGS = $CXXFLAGS@" vice-v7a/src/resid-fp/Makefile' || exit 1
fi
make -C vice-v7a -j4 && mv -f vice-v7a/src/x64 libapplication-armeabi-v7a.so || exit 1
fi

1
project/jni/application/vice/AndroidBuild.sh Symbolic link
View File

@@ -0,0 +1 @@
vice/Android/vice/AndroidBuild.sh

1
project/jni/application/vice/AndroidData Symbolic link
View File

@@ -0,0 +1 @@
vice/Android/vice/AndroidData/

BIN
project/jni/application/vice/AndroidData/vice-data1.zip
View File

Binary file not shown.

11
project/jni/application/vice/AndroidPreBuild.sh
View File

@@ -1,11 +0,0 @@
#!/bin/sh
# Download and patch sources
if [ -e vice -a -e vice-v7a ]; then
exit 0
else
wget -c "http://sourceforge.net/projects/vice-emu/files/releases/vice-2.4.tar.gz" && \
tar xvf vice-2.4.tar.gz && \
mv vice-2.4 vice && \
patch -d vice -p1 < vice-2.4-android.diff && cp -as `pwd`/vice vice-v7a || exit 1
fi

29
project/jni/application/vice/c64.com-genlist.sh
View File

@@ -1,29 +0,0 @@
#!/bin/sh
rm -f list.txt list2.txt
mkdir -p games demos
for f in `seq 2400` ; do
[ -e games/$f.html ] || { wget -O games/$f.html "http://www.c64.com/games/$f" && sleep 1 || exit 1 ; }
TITLE="$(cat games/$f.html | iconv -f iso-8859-1 -t utf-8 | grep 'property="og:title"' | sed 's/.*content="\([^"]*\)".*/\1/')"
if [ "$TITLE" = "by - C64.COM" -o "$TITLE" = " by - C64.COM" ]; then
continue
fi
echo "$f: $TITLE"
echo "$TITLE|http://www.c64.com/games/download.php?id=$f^" >> list.txt
done
for f in `seq 2400` ; do
[ -e demos/$f.html ] || { wget -O demos/$f.html "http://www.c64.com/demos/demos_show.php?showid=$f" && sleep 1 || exit 1 ; }
TITLE="$(cat demos/$f.html | iconv -f iso-8859-1 -t utf-8 | grep -m 1 -A 1 'title="' | sed 's/.*title="\([^"]*\)".*/\1 by /' | sed 's@.*<br>\([^<]*\)<br>.*@\1@' | tr -d '\n' | sed 's/ [ ]*/ /g')"
if echo "$TITLE" | grep 'Search results per page by' > /dev/null; then
continue
fi
echo "$f: $TITLE"
echo "$TITLE- C64.COM|http://www.c64.com/demos/download.php?id=$f^" >> list.txt
done
sort list.txt > list2.txt
cat list2.txt | tr -d '\n' > list.txt
rm -f list2.txt

BIN
project/jni/application/vice/icon.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.0 KiB

After

Width:  |  Height:  |  Size: 26 B

1
project/jni/application/vice/icon.png Symbolic link
View File

@@ -0,0 +1 @@
vice/Android/vice/icon.png
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.0 KiB

After

Width:  |  Height:  |  Size: 26 B

1
project/jni/application/vice/vice Submodule

Submodule project/jni/application/vice/vice added at 3da0f0ecdd

569
project/jni/application/vice/vice-2.4-android.diff
View File

@@ -1,569 +0,0 @@
Only in vice/build: Makefile
Only in vice: confdefs.h
Only in vice: config.log
Only in vice: config.status
diff -u -r vice-2.4/config.sub vice/config.sub
--- vice-2.4/config.sub 2010-09-23 05:22:39.000000000 +0300
+++ vice/config.sub 2013-03-04 20:33:34.561747790 +0200
@@ -1194,7 +1194,7 @@
| -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
| -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
- | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+ | -udi* | -eabi* | -androideabi* | -lites* | -ieee* | -go32* | -aux* \
| -chorusos* | -chorusrdb* | -cegcc* \
| -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
| -mingw32* | -linux* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
diff -u -r vice-2.4/configure vice/configure
--- vice-2.4/configure 2012-11-02 23:06:04.000000000 +0200
+++ vice/configure 2013-03-04 20:39:33.873744502 +0200
@@ -1453,6 +1453,7 @@
fi
# Check all directory arguments for consistency.
+if false; then
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
datadir sysconfdir sharedstatedir localstatedir includedir \
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
@@ -1472,6 +1473,7 @@
esac
as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
done
+fi
# There might be people who depend on the old broken behavior: `$host'
# used to hold the argument of --host etc.
Only in vice/data/C128: Makefile
Only in vice/data/C64: Makefile
Only in vice/data/C64DTV: Makefile
Only in vice/data/CBM-II: Makefile
Only in vice/data/DRIVES: Makefile
Only in vice/data/fonts: Makefile
Only in vice/data: Makefile
Only in vice/data/PET: Makefile
Only in vice/data/PLUS4: Makefile
Only in vice/data/PRINTER: Makefile
Only in vice/data/VIC20: Makefile
Only in vice/doc/html: Makefile
Only in vice/doc: Makefile
Only in vice: Makefile
Only in vice/man: Makefile
Only in vice/po: Makefile.in
Only in vice/src/arch/amigaos: .deps
Only in vice/src/arch/amigaos: genintl_h.sh
Only in vice/src/arch/amigaos: Makefile
Only in vice/src/arch/beos: .deps
Only in vice/src/arch/beos: Makefile
Only in vice/src/arch: Makefile
Only in vice/src/arch/msdos: .deps
Only in vice/src/arch/msdos: Makefile
Only in vice/src/arch/os2: .deps
Only in vice/src/arch/os2/dialogs: .deps
Only in vice/src/arch/os2/dialogs: Makefile
Only in vice/src/arch/os2/kbd: .deps
Only in vice/src/arch/os2/kbd: Makefile
Only in vice/src/arch/os2: Makefile
Only in vice/src/arch/os2/snippets: .deps
Only in vice/src/arch/os2/snippets: Makefile
Only in vice/src/arch/os2/vac++: Makefile
diff -u -r vice-2.4/src/arch/sdl/archdep_unix.c vice/src/arch/sdl/archdep_unix.c
--- vice-2.4/src/arch/sdl/archdep_unix.c 2012-10-21 04:20:33.000000000 +0300
+++ vice/src/arch/sdl/archdep_unix.c 2013-03-04 20:33:34.561747790 +0200
@@ -146,18 +146,18 @@
const char *archdep_boot_path(void)
{
- if (boot_path == NULL) {
-#ifdef USE_PROC_SELF_EXE
- /* known from setup in archdep_init_extra() so just reuse it */
- boot_path = lib_stralloc(argv0);
-#else
- boot_path = findpath(argv0, getenv("PATH"), IOUTIL_ACCESS_X_OK);
-#endif
-
- /* Remove the program name. */
- *strrchr(boot_path, '/') = '\0';
- }
-
+// if (boot_path == NULL) {
+//#ifdef USE_PROC_SELF_EXE
+// /* known from setup in archdep_init_extra() so just reuse it */
+// boot_path = lib_stralloc(argv0);
+//#else
+// boot_path = findpath(argv0, getenv("PATH"), IOUTIL_ACCESS_X_OK);
+//#endif
+//
+// /* Remove the program name. */
+// *strrchr(boot_path, '/') = '\0';
+// }
+boot_path = ".";
return boot_path;
}
Only in vice/src/arch/sdl: .deps
Only in vice/src/arch/sdl/dingoo-files: Makefile
diff -u -r vice-2.4/src/arch/sdl/kbd.c vice/src/arch/sdl/kbd.c
--- vice-2.4/src/arch/sdl/kbd.c 2010-09-12 12:35:32.000000000 +0300
+++ vice/src/arch/sdl/kbd.c 2013-03-04 20:33:34.561747790 +0200
@@ -111,6 +111,11 @@
{
int i = 0;
+ if (key==SDLK_F13) {
+ sdl_vkbd_state=!sdl_vkbd_state;
+ if (sdl_vkbd_state==1) sdl_vkbd_activate();
+ }
+
mod &= (KMOD_CTRL|KMOD_SHIFT|KMOD_ALT|KMOD_META);
if (mod) {
Only in vice/src/arch/sdl: Makefile
Only in vice/src/arch/sdl/syllable-files: Makefile
diff -u -r vice-2.4/src/arch/sdl/uimenu.c vice/src/arch/sdl/uimenu.c
--- vice-2.4/src/arch/sdl/uimenu.c 2011-01-26 17:04:18.000000000 +0200
+++ vice/src/arch/sdl/uimenu.c 2013-03-04 20:33:34.561747790 +0200
@@ -750,8 +750,9 @@
if (vsid_mode && (sdl_vsid_state & SDL_VSID_ACTIVE)) {
sdl_vsid_close();
}
-
+#ifndef ANDROID
SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
+#endif
sdl_menu_state = 1;
ui_check_mouse_cursor();
}
@@ -762,7 +763,9 @@
sdl_menu_state = 0;
ui_check_mouse_cursor();
+#ifndef ANDROID
SDL_EnableKeyRepeat(0, 0);
+#endif
/* Do not resume sound if in warp mode */
resources_get_int("WarpMode", &warp_state);
Only in vice/src/arch/sdl/win32-msvc: Makefile
Only in vice/src/arch/sdl/win32-watcom: Makefile
Only in vice/src/arch/sdl/win64-msvc: Makefile
Only in vice/src/arch/sdl/winmips-msvc: Makefile
Only in vice/src/arch/sdl/xbox: Makefile
diff -u -r vice-2.4/src/arch/unix/archdep.c vice/src/arch/unix/archdep.c
--- vice-2.4/src/arch/unix/archdep.c 2012-10-19 19:40:13.000000000 +0300
+++ vice/src/arch/unix/archdep.c 2013-03-04 20:33:34.565747790 +0200
@@ -117,13 +117,13 @@
const char *archdep_boot_path(void)
{
- if (boot_path == NULL) {
- boot_path = findpath(argv0, getenv("PATH"), IOUTIL_ACCESS_X_OK);
-
- /* Remove the program name. */
- *strrchr(boot_path, '/') = '\0';
- }
-
+// if (boot_path == NULL) {
+// boot_path = findpath(argv0, getenv("PATH"), IOUTIL_ACCESS_X_OK);
+//
+// /* Remove the program name. */
+// *strrchr(boot_path, '/') = '\0';
+// }
+boot_path = ".";
return boot_path;
}
Only in vice/src/arch/unix: .deps
Only in vice/src/arch/unix/gp2x: .deps
Only in vice/src/arch/unix/gp2x: Makefile
Only in vice/src/arch/unix/gp2x/minimal: .deps
Only in vice/src/arch/unix/gp2x/minimal: Makefile
Only in vice/src/arch/unix/gp2x/wiz: .deps
Only in vice/src/arch/unix/gp2x/wiz: Makefile
Only in vice/src/arch/unix/gui: .deps
Only in vice/src/arch/unix/gui: Makefile
Only in vice/src/arch/unix/macosx/cocoa: .deps
Only in vice/src/arch/unix/macosx/cocoa/dialog: .deps
Only in vice/src/arch/unix/macosx/cocoa/dialog: Makefile
Only in vice/src/arch/unix/macosx/cocoa: Makefile
Only in vice/src/arch/unix/macosx/cocoa/menu: .deps
Only in vice/src/arch/unix/macosx/cocoa/menu: Makefile
Only in vice/src/arch/unix/macosx/cocoa/view: .deps
Only in vice/src/arch/unix/macosx/cocoa/view: Makefile
Only in vice/src/arch/unix/macosx: .deps
Only in vice/src/arch/unix/macosx: Makefile
Only in vice/src/arch/unix/macosx/Resources/English.lproj: Makefile
Only in vice/src/arch/unix/macosx/Resources: Makefile
Only in vice/src/arch/unix: Makefile
Only in vice/src/arch/unix/next_open_rhap: vice.info
Only in vice/src/arch/unix/readline: .deps
Only in vice/src/arch/unix/readline: Makefile
diff -u -r vice-2.4/src/arch/unix/socketimpl.h vice/src/arch/unix/socketimpl.h
--- vice-2.4/src/arch/unix/socketimpl.h 2012-09-26 00:12:04.000000000 +0300
+++ vice/src/arch/unix/socketimpl.h 2013-03-04 20:33:34.565747790 +0200
@@ -85,7 +85,7 @@
#endif
#ifndef HAVE_IN_ADDR_T
-typedef unsigned long in_addr_t;
+//typedef unsigned long in_addr_t;
#endif
#endif /* #ifdef HAVE_NETWORK */
Only in vice/src/arch/unix/x11: .deps
Only in vice/src/arch/unix/x11/gnome: .deps
Only in vice/src/arch/unix/x11/gnome: Makefile
Only in vice/src/arch/unix/x11: Makefile
Only in vice/src/arch/unix/x11/xaw: .deps
Only in vice/src/arch/unix/x11/xaw: Makefile
Only in vice/src/arch/unix/x11/xaw/widgets: .deps
Only in vice/src/arch/unix/x11/xaw/widgets: Makefile
Only in vice/src/arch/win32: .deps
Only in vice/src/arch/win32: Makefile
Only in vice/src/arch/win32/utils: .deps
Only in vice/src/arch/win32/utils: Makefile
diff -u -r vice-2.4/src/arch/win32/vice-version.bat vice/src/arch/win32/vice-version.bat
--- vice-2.4/src/arch/win32/vice-version.bat 2012-11-02 23:23:55.000000000 +0200
+++ vice/src/arch/win32/vice-version.bat 2013-03-04 20:40:28.265744002 +0200
@@ -1 +1 @@
-set VICEVERSION=2.4
+set VICEVERSION=2.4
Only in vice/src/arch/win64: Makefile
Only in vice/src/c128: .deps
Only in vice/src/c128: Makefile
Only in vice/src/c64/cart: .deps
Only in vice/src/c64/cart: Makefile
Only in vice/src/c64: .deps
Only in vice/src/c64: Makefile
Only in vice/src/c64dtv: .deps
Only in vice/src/c64dtv: Makefile
Only in vice/src/cbm2: .deps
Only in vice/src/cbm2: Makefile
Only in vice/src: config.h
Only in vice/src/core: .deps
Only in vice/src/core: Makefile
Only in vice/src/crtc: .deps
Only in vice/src/crtc: Makefile
Only in vice/src: .deps
Only in vice/src/diskimage: .deps
Only in vice/src/diskimage: Makefile
Only in vice/src/drive: .deps
Only in vice/src/drive/iec/c64exp: .deps
Only in vice/src/drive/iec/c64exp: Makefile
Only in vice/src/drive/iec: .deps
Only in vice/src/drive/iec: Makefile
Only in vice/src/drive/iec/plus4exp: .deps
Only in vice/src/drive/iec/plus4exp: Makefile
Only in vice/src/drive/iec128dcr: .deps
Only in vice/src/drive/iec128dcr: Makefile
Only in vice/src/drive/iecieee: .deps
Only in vice/src/drive/iecieee: Makefile
Only in vice/src/drive/ieee: .deps
Only in vice/src/drive/ieee: Makefile
Only in vice/src/drive: Makefile
Only in vice/src/drive/tcbm: .deps
Only in vice/src/drive/tcbm: Makefile
Only in vice/src/fileio: .deps
Only in vice/src/fileio: Makefile
Only in vice/src/fsdevice: .deps
Only in vice/src/fsdevice: Makefile
Only in vice/src/gfxoutputdrv: .deps
diff -u -r vice-2.4/src/gfxoutputdrv/ffmpegdrv.c vice/src/gfxoutputdrv/ffmpegdrv.c
--- vice-2.4/src/gfxoutputdrv/ffmpegdrv.c 2012-02-13 21:31:44.000000000 +0200
+++ vice/src/gfxoutputdrv/ffmpegdrv.c 2013-03-04 20:33:34.565747790 +0200
@@ -343,7 +343,7 @@
c = st->codec;
c->codec_id = ffmpegdrv_fmt->audio_codec;
c->codec_type = AVMEDIA_TYPE_AUDIO;
- c->sample_fmt = SAMPLE_FMT_S16;
+ c->sample_fmt = AV_SAMPLE_FMT_S16;
/* put sample parameters */
c->bit_rate = audio_bitrate;
@@ -613,12 +613,7 @@
if (!video_init_done || !audio_init_done)
return 0;
- if ((*ffmpeglib.p_av_set_parameters)(ffmpegdrv_oc, NULL) < 0) {
- log_debug("ffmpegdrv: Invalid output format parameters");
- return -1;
- }
-
- (*ffmpeglib.p_dump_format)(ffmpegdrv_oc, 0, ffmpegdrv_oc->filename, 1);
+ (*ffmpeglib.p_av_dump_format)(ffmpegdrv_oc, 0, ffmpegdrv_oc->filename, 1);
if (video_st && (ffmpegdrv_open_video(ffmpegdrv_oc, video_st) < 0)) {
ui_error(translate_text(IDGS_FFMPEG_CANNOT_OPEN_VSTREAM));
@@ -632,8 +627,8 @@
}
if (!(ffmpegdrv_fmt->flags & AVFMT_NOFILE)) {
- if ((*ffmpeglib.p_url_fopen)(&ffmpegdrv_oc->pb, ffmpegdrv_oc->filename,
- URL_WRONLY) < 0)
+ if ((*ffmpeglib.p_avio_open)(&ffmpegdrv_oc->pb, ffmpegdrv_oc->filename,
+ AVIO_FLAG_WRITE) < 0)
{
ui_error(translate_text(IDGS_FFMPEG_CANNOT_OPEN_S), ffmpegdrv_oc->filename);
screenshot_stop_recording();
@@ -642,7 +637,7 @@
}
- (*ffmpeglib.p_av_write_header)(ffmpegdrv_oc);
+ (*ffmpeglib.p_avformat_write_header)(ffmpegdrv_oc, NULL);
log_debug("ffmpegdrv: Initialized file successfully");
@@ -724,7 +719,7 @@
(*ffmpeglib.p_av_write_trailer)(ffmpegdrv_oc);
if (!(ffmpegdrv_fmt->flags & AVFMT_NOFILE)) {
/* close the output file */
- (*ffmpeglib.p_url_fclose)(ffmpegdrv_oc->pb);
+ (*ffmpeglib.p_avio_close)(ffmpegdrv_oc->pb);
}
}
diff -u -r vice-2.4/src/gfxoutputdrv/ffmpeglib.c vice/src/gfxoutputdrv/ffmpeglib.c
--- vice-2.4/src/gfxoutputdrv/ffmpeglib.c 2011-09-18 16:09:45.000000000 +0300
+++ vice/src/gfxoutputdrv/ffmpeglib.c 2013-03-04 20:33:34.565747790 +0200
@@ -76,6 +76,12 @@
static void *swscale_so = NULL;
#endif
+#ifdef __ANDROID__
+#define GET_SYMBOL_AND_TEST_AVCODEC( _name_ ) lib->p_##_name_ = &_name_;
+#define GET_SYMBOL_AND_TEST_AVFORMAT( _name_ ) lib->p_##_name_ = &_name_;
+#define GET_SYMBOL_AND_TEST_AVUTIL( _name_ ) lib->p_##_name_ = &_name_;
+#define GET_SYMBOL_AND_TEST_SWSCALE( _name_ ) lib->p_##_name_ = &_name_;
+#else
/* macro for getting functionpointers from avcodec */
#define GET_SYMBOL_AND_TEST_AVCODEC( _name_ ) \
lib->p_##_name_ = (_name_##_t) vice_dynlib_symbol(avcodec_so, #_name_ ); \
@@ -107,6 +113,7 @@
log_debug("getting symbol " #_name_ " failed!"); \
return -1; \
}
+#endif
static int check_version(const char *lib_name, void *handle, const char *symbol,
unsigned ver_inc)
@@ -208,13 +215,12 @@
GET_SYMBOL_AND_TEST_AVFORMAT(av_init_packet);
GET_SYMBOL_AND_TEST_AVFORMAT(av_register_all);
GET_SYMBOL_AND_TEST_AVFORMAT(av_new_stream);
- GET_SYMBOL_AND_TEST_AVFORMAT(av_set_parameters);
- GET_SYMBOL_AND_TEST_AVFORMAT(av_write_header);
+ GET_SYMBOL_AND_TEST_AVFORMAT(avformat_write_header);
GET_SYMBOL_AND_TEST_AVFORMAT(av_write_frame);
GET_SYMBOL_AND_TEST_AVFORMAT(av_write_trailer);
- GET_SYMBOL_AND_TEST_AVFORMAT(url_fopen);
- GET_SYMBOL_AND_TEST_AVFORMAT(url_fclose);
- GET_SYMBOL_AND_TEST_AVFORMAT(dump_format);
+ GET_SYMBOL_AND_TEST_AVFORMAT(avio_open);
+ GET_SYMBOL_AND_TEST_AVFORMAT(avio_close);
+ GET_SYMBOL_AND_TEST_AVFORMAT(av_dump_format);
GET_SYMBOL_AND_TEST_AVFORMAT(av_guess_format);
#ifndef HAVE_FFMPEG_SWSCALE
GET_SYMBOL_AND_TEST_AVFORMAT(img_convert);
@@ -240,13 +246,12 @@
lib->p_av_init_packet = NULL;
lib->p_av_register_all = NULL;
lib->p_av_new_stream = NULL;
- lib->p_av_set_parameters = NULL;
- lib->p_av_write_header = NULL;
+ lib->p_avformat_write_header = NULL;
lib->p_av_write_frame = NULL;
lib->p_av_write_trailer = NULL;
- lib->p_url_fopen = NULL;
- lib->p_url_fclose = NULL;
- lib->p_dump_format = NULL;
+ lib->p_avio_open = NULL;
+ lib->p_avio_close = NULL;
+ lib->p_av_dump_format = NULL;
lib->p_av_guess_format = NULL;
#ifndef HAVE_FFMPEG_SWSCALE
lib->p_img_convert = NULL;
diff -u -r vice-2.4/src/gfxoutputdrv/ffmpeglib.h vice/src/gfxoutputdrv/ffmpeglib.h
--- vice-2.4/src/gfxoutputdrv/ffmpeglib.h 2011-10-24 22:06:48.000000000 +0300
+++ vice/src/gfxoutputdrv/ffmpeglib.h 2013-03-04 20:33:34.565747790 +0200
@@ -64,6 +64,12 @@
#define AV_PKT_FLAG_KEY PKT_FLAG_KEY
#endif
+#if LIBAVCODEC_VERSION_MAJOR >= 54
+typedef struct AVIOContext ByteIOContext;
+
+
+#endif
+
/* generic version function */
typedef unsigned (*ffmpeg_version_t) (void);
@@ -80,12 +86,11 @@
typedef void (*av_init_packet_t) (AVPacket *pkt);
typedef void (*av_register_all_t) (void);
typedef AVStream* (*av_new_stream_t) (AVFormatContext*, int);
-typedef int (*av_set_parameters_t) (AVFormatContext*, AVFormatParameters*);
-typedef int (*av_write_header_t) (AVFormatContext*);
+typedef int (*avformat_write_header_t) (AVFormatContext*, AVDictionary **);
typedef int (*av_write_frame_t) (AVFormatContext*, AVPacket*);
typedef int (*av_write_trailer_t) (AVFormatContext*);
-typedef int (*url_fopen_t) (ByteIOContext**, const char*, int);
-typedef int (*url_fclose_t) (ByteIOContext*);
+typedef int (*avio_open_t) (ByteIOContext**, const char*, int);
+typedef int (*avio_close_t) (ByteIOContext*);
typedef void (*dump_format_t) (AVFormatContext *, int, const char*, int);
typedef AVOutputFormat* (*av_guess_format_t) (const char*, const char*, const char*);
typedef int (*img_convert_t) (AVPicture*, int, AVPicture*, int, int, int);
@@ -118,13 +123,12 @@
av_init_packet_t p_av_init_packet;
av_register_all_t p_av_register_all;
av_new_stream_t p_av_new_stream;
- av_set_parameters_t p_av_set_parameters;
- av_write_header_t p_av_write_header;
+ avformat_write_header_t p_avformat_write_header;
av_write_frame_t p_av_write_frame;
av_write_trailer_t p_av_write_trailer;
- url_fopen_t p_url_fopen;
- url_fclose_t p_url_fclose;
- dump_format_t p_dump_format;
+ avio_open_t p_avio_open;
+ avio_close_t p_avio_close;
+ dump_format_t p_av_dump_format;
av_guess_format_t p_av_guess_format;
#ifndef HAVE_FFMPEG_SWSCALE
img_convert_t p_img_convert;
Only in vice/src/gfxoutputdrv: Makefile
Only in vice/src/iecbus: .deps
Only in vice/src/iecbus: Makefile
Only in vice/src/imagecontents: .deps
Only in vice/src/imagecontents: Makefile
Only in vice/src: infocontrib.h
Only in vice/src/lib: Makefile
Only in vice/src/lib/p64: .deps
Only in vice/src/lib/p64: Makefile
diff -u -r vice-2.4/src/log.c vice/src/log.c
--- vice-2.4/src/log.c 2011-04-29 23:04:04.000000000 +0300
+++ vice/src/log.c 2013-03-04 20:33:34.565747790 +0200
@@ -38,6 +38,9 @@
#include "resources.h"
#include "translate.h"
#include "util.h"
+#ifdef __ANDROID__
+#include <android/log.h>
+#endif
static FILE *log_file = NULL;
@@ -303,6 +306,9 @@
rc = -1;
}
+#ifdef __ANDROID__
+ __android_log_vprint(ANDROID_LOG_INFO, "VICE", format, ap);
+#endif
lib_free(logtxt);
return rc;
Only in vice/src: Makefile
Only in vice/src/monitor: .deps
Only in vice/src/monitor: Makefile
Only in vice/src/parallel: .deps
Only in vice/src/parallel: Makefile
Only in vice/src/pet: .deps
Only in vice/src/pet: Makefile
Only in vice/src/platform: .deps
Only in vice/src/platform: Makefile
Only in vice/src/plus4: .deps
Only in vice/src/plus4: Makefile
Only in vice/src/printerdrv: .deps
Only in vice/src/printerdrv: Makefile
Only in vice/src/raster: .deps
Only in vice/src/raster: Makefile
diff -u -r vice-2.4/src/resid/configure vice/src/resid/configure
--- vice-2.4/src/resid/configure 2012-11-02 23:03:29.000000000 +0200
+++ vice/src/resid/configure 2013-03-04 20:41:31.889743422 +0200
@@ -1137,6 +1137,7 @@
fi
# Check all directory arguments for consistency.
+if false; then
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
datadir sysconfdir sharedstatedir localstatedir includedir \
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
@@ -1156,6 +1157,7 @@
esac
as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
done
+fi
# There might be people who depend on the old broken behavior: `$host'
# used to hold the argument of --host etc.
diff -u -r vice-2.4/src/resid-dtv/configure vice/src/resid-dtv/configure
--- vice-2.4/src/resid-dtv/configure 2012-11-02 23:04:16.000000000 +0200
+++ vice/src/resid-dtv/configure 2013-03-04 20:41:47.569743283 +0200
@@ -1131,6 +1131,7 @@
fi
# Check all directory arguments for consistency.
+if false; then
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
datadir sysconfdir sharedstatedir localstatedir includedir \
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
@@ -1150,6 +1151,7 @@
esac
as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
done
+fi
# There might be people who depend on the old broken behavior: `$host'
# used to hold the argument of --host etc.
diff -u -r vice-2.4/src/resid-fp/configure vice/src/resid-fp/configure
--- vice-2.4/src/resid-fp/configure 2012-11-02 23:05:05.000000000 +0200
+++ vice/src/resid-fp/configure 2013-03-04 20:41:57.497743185 +0200
@@ -1144,6 +1144,7 @@
fi
# Check all directory arguments for consistency.
+if false; then
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
datadir sysconfdir sharedstatedir localstatedir includedir \
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
@@ -1163,6 +1164,7 @@
esac
as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
done
+fi
# There might be people who depend on the old broken behavior: `$host'
# used to hold the argument of --host etc.
Only in vice/src/rs232drv: .deps
Only in vice/src/rs232drv: Makefile
Only in vice/src/rtc: .deps
Only in vice/src/rtc: Makefile
Only in vice/src/serial: .deps
Only in vice/src/serial: Makefile
Only in vice/src/sid: .deps
Only in vice/src/sid: Makefile
Only in vice/src/sounddrv: .deps
Only in vice/src/sounddrv: Makefile
Only in vice/src: stamp-h1
Only in vice/src/tape: .deps
Only in vice/src/tape: Makefile
Only in vice/src: translate.h
Only in vice/src: try.tmp
Only in vice/src/userport: .deps
Only in vice/src/userport: Makefile
Only in vice/src/vdc: .deps
Only in vice/src/vdc: Makefile
Only in vice/src/vdrive: .deps
Only in vice/src/vdrive: Makefile
Only in vice/src/vic20/cart: .deps
Only in vice/src/vic20/cart: Makefile
Only in vice/src/vic20: .deps
Only in vice/src/vic20: Makefile
Only in vice/src/vicii: .deps
Only in vice/src/vicii: Makefile
Only in vice/src/viciisc: .deps
Only in vice/src/viciisc: Makefile
Only in vice/src/video: .deps
Only in vice/src/video: Makefile