diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ca097baafe12d19d578632476d173fa39baedda9..c254b82b387f281e960e24dc734d34dd5614e700 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -22,21 +22,6 @@ variables: script: - ./compileAndBuildVLCKit.sh -${BUILD_PARAM} -continous-MobileVLCKit-main: - extends: - - .continous-job-base-main - - .continous-build-base-main - variables: - BUILD_PARAM: "vf7" - JOB_NAME: "MobileVLCKit" - -continous-TVVLCKit-main: - extends: - - .continous-job-base-main - - .continous-build-base-main - variables: - BUILD_PARAM: "vft" - JOB_NAME: "TVVLCKit" continous-VLCKit-main: extends: @@ -71,23 +56,6 @@ continous-VLCKit-main: - ./Packaging/create-distributable-package.sh -${PACKAGING_PARAM} - mv *.tar.xz ${JOB_NAME}-${VLC_VERSION}-`date +%Y%m%d-%H%M`.tar.xz -dev-artifacts-MobileVLCKit-main: - extends: - - .dev-artifacts-job-base-main - - .dev-artifacts-build-base-main - variables: - BUILD_PARAM: "vf7" - PACKAGING_PARAM: "vm" - JOB_NAME: "MobileVLCKit" - -dev-artifacts-TVVLCKit-main: - extends: - - .dev-artifacts-job-base-main - - .dev-artifacts-build-base-main - variables: - BUILD_PARAM: "vft" - PACKAGING_PARAM: "vt" - JOB_NAME: "TVVLCKit" dev-artifacts-VLCKit-main: extends: @@ -117,19 +85,6 @@ dev-artifacts-VLCKit-main: - cd Packaging - ./buildAndDeployFrameworks.sh -${BUILD_PARAM} -MobileVLCKit-main: - extends: - - .release-job-base-main - - .release-build-base-main - variables: - BUILD_PARAM: "m" - -TVVLCKit-main: - extends: - - .release-job-base-main - - .release-build-base-main - variables: - BUILD_PARAM: "t" VLCKit-main: extends: diff --git a/libvlc/patches/0060-User-agent.patch b/libvlc/patches/0060-User-agent.patch new file mode 100644 index 0000000000000000000000000000000000000000..6a304ce01921855d3dd108851ca959e352101d7b --- /dev/null +++ b/libvlc/patches/0060-User-agent.patch @@ -0,0 +1,58 @@ +From 858281086da69ac7982a3e41fd497caece12686d Mon Sep 17 00:00:00 2001 +From: xjbeta <xjbeta.tiny@gmail.com> +Date: Wed, 21 Jun 2023 16:01:42 +0800 +Subject: [PATCH] User-agent + +--- + bin/darwinvlc.m | 2 +- + modules/access/http/tunnel.c | 2 +- + src/libvlc.c | 6 +++--- + 3 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/bin/darwinvlc.m b/bin/darwinvlc.m +index 8a7124104f..63d8909279 100644 +--- a/bin/darwinvlc.m ++++ b/bin/darwinvlc.m +@@ -271,7 +271,7 @@ int main(int i_argc, const char *ppsz_argv[]) + int ret = 1; + libvlc_set_exit_handler(vlc, vlc_terminate, NULL); + libvlc_set_app_id(vlc, "org.VideoLAN.VLC", PACKAGE_VERSION, PACKAGE_NAME); +- libvlc_set_user_agent(vlc, "VLC media player", "VLC/"PACKAGE_VERSION); ++ libvlc_set_user_agent(vlc, "VLC media player", "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.4 Safari/605.1.15"); + + if (libvlc_add_intf(vlc, NULL)) { + fprintf(stderr, "VLC cannot start any interface. Exiting.\n"); +diff --git a/modules/access/http/tunnel.c b/modules/access/http/tunnel.c +index ba6e3cb7b2..141f9e9dee 100644 +--- a/modules/access/http/tunnel.c ++++ b/modules/access/http/tunnel.c +@@ -52,7 +52,7 @@ static struct vlc_http_msg *vlc_http_tunnel_open(struct vlc_http_conn *conn, + return NULL; + + vlc_http_msg_add_header(req, "ALPN", "h2, http%%2F1.1"); +- vlc_http_msg_add_agent(req, PACKAGE_NAME "/" PACKAGE_VERSION); ++ vlc_http_msg_add_agent(req, "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.4 Safari/605.1.15"); + if (username != NULL) + vlc_http_msg_add_creds_basic(req, true, username, + (password != NULL) ? password : ""); +diff --git a/src/libvlc.c b/src/libvlc.c +index 723a7c94ef..4ab44d744a 100644 +--- a/src/libvlc.c ++++ b/src/libvlc.c +@@ -252,10 +252,10 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, + * (in place of VLC main()) *here*. */ + var_Create( p_libvlc, "user-agent", VLC_VAR_STRING ); + var_SetString( p_libvlc, "user-agent", +- "VLC media player (LibVLC "VERSION")" ); ++ "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.4 Safari/605.1.15" ); + var_Create( p_libvlc, "http-user-agent", VLC_VAR_STRING ); +- var_SetString( p_libvlc, "http-user-agent", +- "VLC/"PACKAGE_VERSION" LibVLC/"PACKAGE_VERSION ); ++ var_SetString( p_libvlc, "http-user-agent", ++ "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.4 Safari/605.1.15" ); + var_Create( p_libvlc, "app-icon-name", VLC_VAR_STRING ); + var_SetString( p_libvlc, "app-icon-name", PACKAGE_NAME ); + var_Create( p_libvlc, "app-id", VLC_VAR_STRING ); +-- +2.37.5 +