cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- enable the use of ASM code in libjpeg-turbo [1]

Browse Source 
- make plugin-container work with custom LD_LIBRARY_PATH [2]

Do not bump PORTREVISION as firefox package was not buildable due to size
constraints before my last bsd.gecko.mk commit.

PR:		ports/158371 [1]
Submitted by:	Pan Tsu <inyaoo@gmail.com> [1]
		kmoore [2]
Obtained from:	mozilla bugtracker [2]
This commit is contained in:
Florian Smeets 2011-06-28 16:42:58 +00:00
parent dfadc9fbca
commit c1e827f955
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=276584
4 changed files with 70 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
www/firefox-esr/files/patch-bugzilla-535300 Normal file
View File

@ -0,0 +1,20 @@
--- ipc/glue/GeckoChildProcessHost.cpp.orig 2011-06-15 23:57:27.000000000 +0200
+++ ipc/glue/GeckoChildProcessHost.cpp 2011-06-27 23:48:28.799495181 +0200
@@ -433,7 +433,16 @@
#ifdef ANDROID
path += "/lib";
#endif
- newEnvVars["LD_LIBRARY_PATH"] = path.get();
+ const char *ld_library_path = PR_GetEnv("LD_LIBRARY_PATH");
+ nsCString new_ld_lib_path;
+ if (ld_library_path && *ld_library_path) {
+ new_ld_lib_path.Assign(ld_library_path);
+ new_ld_lib_path.AppendLiteral(":");
+ new_ld_lib_path.Append(path.get());
+ newEnvVars["LD_LIBRARY_PATH"] = new_ld_lib_path.get();
+ } else {
+ newEnvVars["LD_LIBRARY_PATH"] = path.get();
+ }
#elif OS_MACOSX
newEnvVars["DYLD_LIBRARY_PATH"] = path.get();
#endif

15
www/firefox-esr/files/patch-configure.in
View File

@ -69,3 +69,18 @@
SunOS:x86)
VPX_ASFLAGS="-f elf32 -rnasm -pnasm"
VPX_X86_ASM=1
@@ -6392,6 +6402,14 @@ if test -n "$MOZ_LIBJPEG_TURBO"; then
LIBJPEG_TURBO_ASFLAGS="-f elf64 -rnasm -pnasm -D__x86_64__ -DPIC -DELF"
LIBJPEG_TURBO_X64_ASM=1
;;
+ FreeBSD:i386)
+ LIBJPEG_TURBO_ASFLAGS="-f elf32 -rnasm -pnasm -DPIC -DELF"
+ LIBJPEG_TURBO_X86_ASM=1
+ ;;
+ FreeBSD:amd64)
+ LIBJPEG_TURBO_ASFLAGS="-f elf64 -rnasm -pnasm -D__x86_64__ -DPIC -DELF"
+ LIBJPEG_TURBO_X64_ASM=1
+ ;;
SunOS:i?86)
LIBJPEG_TURBO_ASFLAGS="-f elf32 -rnasm -pnasm -DPIC -DELF"
LIBJPEG_TURBO_X86_ASM=1

20
www/firefox/files/patch-bugzilla-535300 Normal file
View File

@ -0,0 +1,20 @@
--- ipc/glue/GeckoChildProcessHost.cpp.orig 2011-06-15 23:57:27.000000000 +0200
+++ ipc/glue/GeckoChildProcessHost.cpp 2011-06-27 23:48:28.799495181 +0200
@@ -433,7 +433,16 @@
#ifdef ANDROID
path += "/lib";
#endif
- newEnvVars["LD_LIBRARY_PATH"] = path.get();
+ const char *ld_library_path = PR_GetEnv("LD_LIBRARY_PATH");
+ nsCString new_ld_lib_path;
+ if (ld_library_path && *ld_library_path) {
+ new_ld_lib_path.Assign(ld_library_path);
+ new_ld_lib_path.AppendLiteral(":");
+ new_ld_lib_path.Append(path.get());
+ newEnvVars["LD_LIBRARY_PATH"] = new_ld_lib_path.get();
+ } else {
+ newEnvVars["LD_LIBRARY_PATH"] = path.get();
+ }
#elif OS_MACOSX
newEnvVars["DYLD_LIBRARY_PATH"] = path.get();
#endif

15
www/firefox/files/patch-configure.in
View File

@ -69,3 +69,18 @@
SunOS:x86)
VPX_ASFLAGS="-f elf32 -rnasm -pnasm"
VPX_X86_ASM=1
@@ -6392,6 +6402,14 @@ if test -n "$MOZ_LIBJPEG_TURBO"; then
LIBJPEG_TURBO_ASFLAGS="-f elf64 -rnasm -pnasm -D__x86_64__ -DPIC -DELF"
LIBJPEG_TURBO_X64_ASM=1
;;
+ FreeBSD:i386)
+ LIBJPEG_TURBO_ASFLAGS="-f elf32 -rnasm -pnasm -DPIC -DELF"
+ LIBJPEG_TURBO_X86_ASM=1
+ ;;
+ FreeBSD:amd64)
+ LIBJPEG_TURBO_ASFLAGS="-f elf64 -rnasm -pnasm -D__x86_64__ -DPIC -DELF"
+ LIBJPEG_TURBO_X64_ASM=1
+ ;;
SunOS:i?86)
LIBJPEG_TURBO_ASFLAGS="-f elf32 -rnasm -pnasm -DPIC -DELF"
LIBJPEG_TURBO_X86_ASM=1