diff --git a/build/extlib/perms-vlc_1300.diff b/build/extlib/perms-vlc_1300.diff index 22f6e41b8b..fabd28d62b 100644 --- a/build/extlib/perms-vlc_1300.diff +++ b/build/extlib/perms-vlc_1300.diff @@ -1,153 +1,51 @@ -diff --git a/autotools/config.rpath b/autotools/config.rpath -old mode 100644 -new mode 100755 -diff --git a/bootstrap b/bootstrap -old mode 100644 -new mode 100755 -diff --git a/contrib/bootstrap b/contrib/bootstrap -old mode 100644 -new mode 100755 -diff --git a/contrib/src/change_prefix.sh b/contrib/src/change_prefix.sh -old mode 100644 -new mode 100755 -diff --git a/contrib/src/get-arch.sh b/contrib/src/get-arch.sh -old mode 100644 -new mode 100755 -diff --git a/contrib/src/pkg-static.sh b/contrib/src/pkg-static.sh -old mode 100644 -new mode 100755 -diff --git a/contrib/src/qt4/fix_header.sh b/contrib/src/qt4/fix_header.sh -old mode 100644 -new mode 100755 -diff --git a/doc/demo.sh b/doc/demo.sh -old mode 100644 -new mode 100755 -diff --git a/doc/doc_helper.sh b/doc/doc_helper.sh -old mode 100644 -new mode 100755 -diff --git a/extras/analyser/zsh_completion.sh b/extras/analyser/zsh_completion.sh -old mode 100644 -new mode 100755 -diff --git a/extras/buildsystem/make.pl b/extras/buildsystem/make.pl -old mode 100644 -new mode 100755 -diff --git a/extras/misc/authors_list.sh b/extras/misc/authors_list.sh -old mode 100644 -new mode 100755 -diff --git a/extras/misc/mpris.py b/extras/misc/mpris.py -old mode 100644 -new mode 100755 -diff --git a/extras/misc/stackhandler.py b/extras/misc/stackhandler.py -old mode 100644 -new mode 100755 -diff --git a/extras/misc/translators_list.sh b/extras/misc/translators_list.sh -old mode 100644 -new mode 100755 -diff --git a/extras/package/ios/build.sh b/extras/package/ios/build.sh -old mode 100644 -new mode 100755 -diff --git a/extras/package/ipkg/postinst.gpe b/extras/package/ipkg/postinst.gpe -old mode 100644 -new mode 100755 -diff --git a/extras/package/ipkg/postinst.opie b/extras/package/ipkg/postinst.opie -old mode 100644 -new mode 100755 -diff --git a/extras/package/ipkg/postinst.zaurus b/extras/package/ipkg/postinst.zaurus -old mode 100644 -new mode 100755 -diff --git a/extras/package/ipkg/postrm.gpe b/extras/package/ipkg/postrm.gpe -old mode 100644 -new mode 100755 -diff --git a/extras/package/ipkg/postrm.opie b/extras/package/ipkg/postrm.opie -old mode 100644 -new mode 100755 -diff --git a/extras/package/ipkg/postrm.zaurus b/extras/package/ipkg/postrm.zaurus -old mode 100644 -new mode 100755 -diff --git a/extras/package/ipkg/rules.gpe b/extras/package/ipkg/rules.gpe -old mode 100644 -new mode 100755 -diff --git a/extras/package/ipkg/rules.h3600 b/extras/package/ipkg/rules.h3600 -old mode 100644 -new mode 100755 -diff --git a/extras/package/ipkg/rules.opie b/extras/package/ipkg/rules.opie -old mode 100644 -new mode 100755 -diff --git a/extras/package/ipkg/rules.zaurus b/extras/package/ipkg/rules.zaurus -old mode 100644 -new mode 100755 -diff --git a/extras/package/ipkg/vlc.gpe b/extras/package/ipkg/vlc.gpe -old mode 100644 -new mode 100755 -diff --git a/extras/package/ipkg/vlc.opie b/extras/package/ipkg/vlc.opie -old mode 100644 -new mode 100755 -diff --git a/extras/package/ipkg/vlc.zaurus b/extras/package/ipkg/vlc.zaurus -old mode 100644 -new mode 100755 -diff --git a/extras/package/macosx/Delete_Preferences.app/Contents/MacOS/applet b/extras/package/macosx/Delete_Preferences.app/Contents/MacOS/applet -old mode 100644 -new mode 100755 -diff --git a/extras/package/macosx/build.sh b/extras/package/macosx/build.sh -old mode 100644 -new mode 100755 -diff --git a/extras/package/macosx/codesign-dp.sh b/extras/package/macosx/codesign-dp.sh -old mode 100644 -new mode 100755 -diff --git a/extras/package/macosx/codesign.sh b/extras/package/macosx/codesign.sh -old mode 100644 -new mode 100755 -diff --git a/extras/package/macosx/configure.sh b/extras/package/macosx/configure.sh -old mode 100644 -new mode 100755 -diff --git a/extras/package/win32/change-contribs-directory.sh b/extras/package/win32/change-contribs-directory.sh -old mode 100644 -new mode 100755 -diff --git a/extras/package/win32/configure.sh b/extras/package/win32/configure.sh -old mode 100644 -new mode 100755 -diff --git a/extras/package/win32/libvlc.dll.manifest b/extras/package/win32/libvlc.dll.manifest -old mode 100644 -new mode 100755 -diff --git a/extras/tools/bootstrap b/extras/tools/bootstrap -old mode 100644 -new mode 100755 -diff --git a/make-alias b/make-alias -old mode 100644 -new mode 100755 -diff --git a/modules/genmf b/modules/genmf -old mode 100644 -new mode 100755 -diff --git a/modules/gui/qt4/recents.cpp b/modules/gui/qt4/recents.cpp -old mode 100644 -new mode 100755 -diff --git a/modules/gui/skins2/parser/gen_builder.py b/modules/gui/skins2/parser/gen_builder.py -old mode 100644 -new mode 100755 -diff --git a/modules/list.sh b/modules/list.sh -old mode 100644 -new mode 100755 -diff --git a/share/lua/http/dialogs/equalizer_window.html b/share/lua/http/dialogs/equalizer_window.html -old mode 100644 -new mode 100755 -diff --git a/share/utils/audio-vlc-default.sh b/share/utils/audio-vlc-default.sh -old mode 100644 -new mode 100755 -diff --git a/share/utils/gnome-vlc-default.sh b/share/utils/gnome-vlc-default.sh -old mode 100644 -new mode 100755 -diff --git a/share/utils/video-vlc-default.sh b/share/utils/video-vlc-default.sh -old mode 100644 -new mode 100755 -diff --git a/src/check_headers b/src/check_headers -old mode 100644 -new mode 100755 -diff --git a/test/modules/lua/telnet.sh b/test/modules/lua/telnet.sh -old mode 100644 -new mode 100755 -diff --git a/test/modules/stream_filter/httplive/traffic-shaping.sh b/test/modules/stream_filter/httplive/traffic-shaping.sh -old mode 100644 -new mode 100755 -diff --git a/test/run_vlc.sh b/test/run_vlc.sh -old mode 100644 -new mode 100755 +autotools/config.rpath +bootstrap +contrib/bootstrap +contrib/src/change_prefix.sh +contrib/src/get-arch.sh +contrib/src/pkg-static.sh +contrib/src/qt4/fix_header.sh +doc/demo.sh +doc/doc_helper.sh +extras/analyser/zsh_completion.sh +extras/buildsystem/make.pl +extras/misc/authors_list.sh +extras/misc/mpris.py +extras/misc/stackhandler.py +extras/misc/translators_list.sh +extras/package/ios/build.sh +extras/package/ipkg/postinst.gpe +extras/package/ipkg/postinst.opie +extras/package/ipkg/postinst.zaurus +extras/package/ipkg/postrm.gpe +extras/package/ipkg/postrm.opie +extras/package/ipkg/postrm.zaurus +extras/package/ipkg/rules.gpe +extras/package/ipkg/rules.h3600 +extras/package/ipkg/rules.opie +extras/package/ipkg/rules.zaurus +extras/package/ipkg/vlc.gpe +extras/package/ipkg/vlc.opie +extras/package/ipkg/vlc.zaurus +extras/package/macosx/Delete_Preferences.app/Contents/MacOS/applet +extras/package/macosx/build.sh +extras/package/macosx/codesign-dp.sh +extras/package/macosx/codesign.sh +extras/package/macosx/configure.sh +extras/package/win32/change-contribs-directory.sh +extras/package/win32/configure.sh +extras/package/win32/libvlc.dll.manifest +extras/tools/bootstrap +make-alias +modules/genmf +modules/gui/qt4/recents.cpp +modules/gui/skins2/parser/gen_builder.py +modules/list.sh +share/lua/http/dialogs/equalizer_window.html +share/utils/audio-vlc-default.sh +share/utils/gnome-vlc-default.sh +share/utils/video-vlc-default.sh +src/check_headers +test/modules/lua/telnet.sh +test/modules/stream_filter/httplive/traffic-shaping.sh +test/run_vlc.sh diff --git a/metadata/org.videolan.vlc.txt b/metadata/org.videolan.vlc.txt index 1c3a3b68fb..651244cb6d 100644 --- a/metadata/org.videolan.vlc.txt +++ b/metadata/org.videolan.vlc.txt @@ -48,11 +48,10 @@ Build Version:0.1.3-ARMv7,1300,0.1.3,subdir=vlc-android,\ forceversion=yes,forcevercode=yes,\ srclibs=VLC@7c52aacbe,\ extlibs=perms-vlc_1300.diff,\ -update=.;../java-libs/SlidingMenu;../java-libs/ActionBarSherlock;\ -../java-libs/WheelView,\ +update=.;../java-libs/SlidingMenu;../java-libs/ActionBarSherlock;../java-libs/WheelView,\ prebuild=sed -i '/ant/d' ../Makefile && cp -r $$VLC$$ ../vlc && \ sed -i 's/debuggable="true"/debuggable="false"/g' AndroidManifest.xml && \ - cd ../vlc/ && git apply ../vlc-android/libs/perms-vlc_1300.diff,\ + cd ../vlc && cat ../vlc-android/libs/perms-vlc_1300.diff |xargs chmod a+x,\ build=cd ../ && ANDROID_ABI=armeabi-v7a ANDROID_SDK=$$SDK$$ \ ANDROID_NDK=$$NDK$$ ./compile.sh release,\ buildjni=no