forked from macports/macports-ports
-
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
4c7410d
commit 80bd867
Showing
2 changed files
with
89 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,81 @@ | ||
--- configure.ac | ||
+++ configure.ac 2024-10-11 19:59:30 | ||
@@ -163,7 +163,7 @@ | ||
OBJCFLAGS="${OBJCFLAGS} -D_INTL_REDIRECT_MACROS -std=gnu99" | ||
LDFLAGS="${LDFLAGS} -Wl,-headerpad_max_install_names" | ||
VLC_ADD_LIBS([libvlc vlc],[-Wl,-undefined,dynamic_lookup,-framework,AppKit]) | ||
- VLC_ADD_LIBS([libvlccore],[-Wl,-framework,CoreFoundation,-framework,CoreServices]) | ||
+ VLC_ADD_LIBS([libvlccore],[-Wl,-framework,CoreFoundation,-framework,CoreServices,-framework,SystemConfiguration]) | ||
|
||
AC_EGREP_CPP(yes, | ||
[#import <TargetConditionals.h> | ||
|
||
--- src/darwin/netconf.c | ||
+++ src/darwin/netconf.c 2024-10-11 17:09:51 | ||
@@ -45,6 +45,7 @@ | ||
char *vlc_getProxyUrl(const char *url) | ||
{ | ||
VLC_UNUSED(url); | ||
+#if TARGET_OS_IPHONE | ||
char *proxy_url = NULL; | ||
CFDictionaryRef dicRef = CFNetworkCopySystemProxySettings(); | ||
if (NULL != dicRef) { | ||
@@ -73,4 +74,58 @@ | ||
} | ||
|
||
return proxy_url; | ||
+#else | ||
+ CFDictionaryRef proxies = SCDynamicStoreCopyProxies(NULL); | ||
+ char *proxy_url = NULL; | ||
+ | ||
+ if (proxies) { | ||
+ CFNumberRef cfn_httpProxyOn = | ||
+ (CFNumberRef)CFDictionaryGetValue(proxies, | ||
+ kSCPropNetProxiesHTTPEnable); | ||
+ if (cfn_httpProxyOn) { | ||
+ int i_httpProxyOn; | ||
+ CFNumberGetValue(cfn_httpProxyOn, kCFNumberIntType, &i_httpProxyOn); | ||
+ CFRelease(cfn_httpProxyOn); | ||
+ | ||
+ if (i_httpProxyOn == 1) // http proxy is on | ||
+ { | ||
+ CFStringRef httpProxy = | ||
+ (CFStringRef)CFDictionaryGetValue(proxies, | ||
+ kSCPropNetProxiesHTTPProxy); | ||
+ | ||
+ if (httpProxy) { | ||
+ CFNumberRef cfn_httpProxyPort = | ||
+ (CFNumberRef)CFDictionaryGetValue(proxies, | ||
+ kSCPropNetProxiesHTTPPort); | ||
+ int i_httpProxyPort; | ||
+ CFNumberGetValue(cfn_httpProxyPort, | ||
+ kCFNumberIntType, | ||
+ &i_httpProxyPort); | ||
+ CFRelease(cfn_httpProxyPort); | ||
+ | ||
+ CFMutableStringRef outputURL = | ||
+ CFStringCreateMutableCopy(kCFAllocatorDefault, | ||
+ 0, | ||
+ httpProxy); | ||
+ if (i_httpProxyPort > 0) | ||
+ CFStringAppendFormat(outputURL, | ||
+ NULL, | ||
+ CFSTR(":%i"), | ||
+ i_httpProxyPort); | ||
+ | ||
+ char buffer[4096]; | ||
+ if (CFStringGetCString(outputURL, buffer, sizeof(buffer), | ||
+ kCFStringEncodingUTF8)) | ||
+ proxy_url = strdup(buffer); | ||
+ | ||
+ CFRelease(outputURL); | ||
+ } | ||
+ CFRelease(httpProxy); | ||
+ } | ||
+ } | ||
+ CFRelease(proxies); | ||
+ } | ||
+ | ||
+ return proxy_url; | ||
+#endif | ||
} |