diff --git a/libass/ass_render.c b/libass/ass_render.c index 380690724..1e2425267 100644 --- a/libass/ass_render.c +++ b/libass/ass_render.c @@ -241,6 +241,12 @@ ass_renderer_t* ass_renderer_init(ass_library_t* library) memset(&text_info, 0, sizeof(text_info)); error = FT_Init_FreeType( &ft ); + +char path[4096]; +*path='\0'; +getcwd(path,4096); +printf("PATH: (%s)\n", path); + if ( error ) { mp_msg(MSGT_ASS, MSGL_FATAL, MSGTR_LIBASS_FT_Init_FreeTypeFailed); goto ass_init_exit; diff --git a/packages/osx_dmg/DS_Store b/packages/osx_dmg/DS_Store deleted file mode 100644 index c4154d343..000000000 Binary files a/packages/osx_dmg/DS_Store and /dev/null differ diff --git a/scripts/osx-dmg-dsstore.pl b/scripts/osx-dmg-dsstore.pl new file mode 100755 index 000000000..52496c744 --- /dev/null +++ b/scripts/osx-dmg-dsstore.pl @@ -0,0 +1,20 @@ +#!/usr/bin/perl -w + +use Mac::Finder::DSStore qw( writeDSDBEntries makeEntries ); +use Mac::Memory qw( ); +use Mac::Files qw( NewAliasMinimal ); + +&writeDSDBEntries("$ARGV[0]", + &makeEntries(".", + BKGD_alias => NewAliasMinimal("$ARGV[2]"), + ICVO => 1, + fwi0_flds => [ 308, 397, 658, 848, "icnv", 0, 0 ], + fwvh => 350, + icgo => "\0\0\0\0\0\0\0\0", + icvo => pack('A4 n A4 A4 n*', "icv4", 90, "none", "botm", 0, 0, 0, 0, 0, 1, 0, 100, 1), + icvt => 12 + ), + &makeEntries("Applications", Iloc_xy => [ 133, 250 ]), + &makeEntries("$ARGV[1]", Iloc_xy => [ 133, 55 ]) +); + diff --git a/scripts/osx-dmg.sh b/scripts/osx-dmg.sh index 4e7530774..0e6d6565d 100755 --- a/scripts/osx-dmg.sh +++ b/scripts/osx-dmg.sh @@ -32,7 +32,6 @@ echo "---- Setting up ----" ln -vsf /Applications "${TMP_DMG}" mkdir -v ${TMP_DMG}/.background cp -v packages/osx_dmg/dmg_background.png ${TMP_DMG}/.background/background.png -cp -v packages/osx_dmg/DS_Store ${TMP_DMG}/.DS_Store cp -v packages/osx_bundle/Contents/Resources/Aegisub.icns ${TMP_DMG}/.VolumeIcon.icns echo @@ -45,13 +44,17 @@ DEV_NAME=`/usr/bin/hdiutil attach -readwrite -noverify -noautoopen "${PKG_NAME_R echo "Device name: ${DEV_NAME}" echo -echo "---- Setting bless -openfolder \"/Volumes/${PKG_NAME_VOLUME}\" ----" +echo "---- Setting bless -openfolder ----" bless -openfolder "/Volumes/${PKG_NAME_VOLUME}" echo echo "---- Setting root icon using SetFile ----" /usr/bin/SetFile -a C "/Volumes/${PKG_NAME_VOLUME}" +echo +echo "--- Generating /Volumes/${PKG_NAME_VOLUME}/.DS_Store ----" +/usr/bin/perl scripts/osx-dmg-dsstore.pl "/Volumes/${PKG_NAME_VOLUME}/.DS_Store" "${PKG_DIR}" "/Volumes/${PKG_NAME_VOLUME}/.background/background.png" + echo echo "---- Detaching ----" /usr/bin/hdiutil detach "${DEV_NAME}"