Zero3K
/
presto
Watch 1
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 1 Wiki Activity
Browse Source

Upload files to 'patches'

tags/12.15.1
Zero3K 3 years ago
parent
e882808810
commit
f26c4a6c57
5 changed files with 214 additions and 0 deletions
Split View Show Diff Stats
  1. 13
    0
      patches/JSExecutionFix.patch
  2. 100
    0
      patches/LinuxBuildFix.patch
  3. 13
    0
      patches/LinuxReleaseFix.patch
  4. 36
    0
      patches/gst-opera_clone.sh
  5. 52
    0
      patches/gst-opera_instructions.txt

+ 13
- 0
patches/JSExecutionFix.patch View File

@@ -0,0 +1,13 @@
diff --git a/platforms/flower/module.build/00-gcc.conf.py b/platforms/flower/module.build/00-gcc.conf.py
index ab24053..f61a260 100644
--- a/platforms/flower/module.build/00-gcc.conf.py
+++ b/platforms/flower/module.build/00-gcc.conf.py
@@ -77,7 +77,7 @@ class GCC(object):
if config.optimizeSize:
flags += ['-Os', '-ffast-math', '-fno-unsafe-math-optimizations']
else:
- flags += ['-O3', '-fno-tree-vectorize'] # tree vectorization causes a crash fillRect
+ flags += ['-O3', '-fno-tree-vectorize', '-fno-strict-aliasing', '-fno-delete-null-pointer-checks'] # tree vectorization causes a crash fillRect
if config.LTO:
flags += ['-flto=' + str(self.LTOJobs), '-fuse-linker-plugin', '-fno-fat-lto-objects']
return flags

+ 100
- 0
patches/LinuxBuildFix.patch View File

@@ -0,0 +1,100 @@
diff --git a/adjunct/bittorrent/bt-upload.cpp b/adjunct/bittorrent/bt-upload.cpp
index b748be6..c1587ae 100644
--- a/adjunct/bittorrent/bt-upload.cpp
+++ b/adjunct/bittorrent/bt-upload.cpp
@@ -517,14 +517,14 @@ OpByteBuffer *UploadTransferBT::OnRequest(BTPacket* packet)
DEBUGTRACE_UP(UNI_L("ILLEGAL length: %d\n"), length);
// error, too large request
Close();
- return FALSE;
+ return NULL;
}
if(offset + length > m_filesize )
{
DEBUGTRACE_UP(UNI_L("ILLEGAL size: %d\n"), offset + length);
// error, size larger than file
Close();
- return FALSE;
+ return NULL;
}
for(P2PFilePart* fragment = m_requested ; fragment != NULL; fragment = fragment->m_next )
diff --git a/adjunct/bittorrent/connection.cpp b/adjunct/bittorrent/connection.cpp
index f79bf93..a0a9523 100644
--- a/adjunct/bittorrent/connection.cpp
+++ b/adjunct/bittorrent/connection.cpp
@@ -1551,7 +1551,7 @@ BTClientConnector *BTServerConnector::VerifyHandshake(OpByteBuffer& buffer, P2PS
if(buffer.DataSize() < 7)
{
- return FALSE;
+ return NULL;
}
// Check for BitTorrent handshake
diff --git a/modules/liblcms/src/cmstypes.c b/modules/liblcms/src/cmstypes.c
index c2d6f94..0e9d4e0 100644
--- a/modules/liblcms/src/cmstypes.c
+++ b/modules/liblcms/src/cmstypes.c
@@ -2368,9 +2368,9 @@ cmsStage* ReadSetOfCurves(struct _cms_typehandler_struct* self, cmsIOHANDLER* io
cmsUInt32Number i;
cmsStage* Lin = NULL;
- if (nCurves > cmsMAXCHANNELS) return FALSE;
+ if (nCurves > cmsMAXCHANNELS) return NULL;
- if (!io -> Seek(io, Offset)) return FALSE;
+ if (!io -> Seek(io, Offset)) return NULL;
for (i=0; i < nCurves; i++)
Curves[i] = NULL;
@@ -5082,7 +5082,7 @@ void *Type_Dictionary_Read(struct _cms_typehandler_struct* self, cmsIOHANDLER* i
if (DisplayNameMLU != NULL) cmsMLUfree(DisplayNameMLU);
if (DisplayValueMLU != NULL) cmsMLUfree(DisplayValueMLU);
- if (!rc) return FALSE;
+ if (!rc) return NULL;
}
FreeArray(&a);
diff --git a/platforms/quix/module.build/autoupdatechecker.conf.py b/platforms/quix/module.build/autoupdatechecker.conf.py
index 340e0e6..b6d9b9b 100644
--- a/platforms/quix/module.build/autoupdatechecker.conf.py
+++ b/platforms/quix/module.build/autoupdatechecker.conf.py
@@ -9,7 +9,7 @@ def libraries(binary='opera'):
if binary == 'opera_autoupdatechecker':
# Use system libs
libs.append(util.PkgConfig('sqlite3'))
- libs.append(util.PkgConfig('tinyxml', static=True))
+ libs.append(util.PkgConfig('tinyxml'))
libs.append(util.PkgConfig('libcurl'))
return libs
diff --git a/platforms/unix/base/x11/x11_globals.h b/platforms/unix/base/x11/x11_globals.h
index 7511001..933d72b 100644
--- a/platforms/unix/base/x11/x11_globals.h
+++ b/platforms/unix/base/x11/x11_globals.h
@@ -33,7 +33,7 @@ public:
:visual(0)
,id(None)
,colormap(None)
- ,fbconfig(None)
+ ,fbconfig(NULL)
,depth(0)
,image_bpp(0)
,r_mask(0)
diff --git a/platforms/unix/base/x11/x11_mdebuffer.cpp b/platforms/unix/base/x11/x11_mdebuffer.cpp
index 5c13ea0..67e5da8 100644
--- a/platforms/unix/base/x11/x11_mdebuffer.cpp
+++ b/platforms/unix/base/x11/x11_mdebuffer.cpp
@@ -46,8 +46,8 @@ X11MdeBuffer::X11MdeBuffer(X11Types::Display *display,
,m_window(window)
,m_widget(g_x11->GetWidgetList()->FindWidget(window))
,m_visual(visual)
- ,m_gc(None)
- ,m_plugin_gc(None)
+ ,m_gc(NULL)
+ ,m_plugin_gc(NULL)
{
}

+ 13
- 0
patches/LinuxReleaseFix.patch View File

@@ -0,0 +1,13 @@
diff --git a/platforms/flower/module.build/00-gcc.conf.py b/platforms/flower/module.build/00-gcc.conf.py
index ab24053..f61a260 100644
--- a/platforms/flower/module.build/00-gcc.conf.py
+++ b/platforms/flower/module.build/00-gcc.conf.py
@@ -77,7 +77,7 @@ class GCC(object):
if config.optimizeSize:
flags += ['-Os', '-ffast-math', '-fno-unsafe-math-optimizations']
else:
- flags += ['-O3', '-fno-tree-vectorize'] # tree vectorization causes a crash fillRect
+ flags += ['-O3', '-fno-tree-vectorize', '-fno-strict-aliasing', '-fno-delete-null-pointer-checks'] # tree vectorization causes a crash fillRect
if config.LTO:
flags += ['-flto=' + str(self.LTOJobs), '-fuse-linker-plugin', '-fno-fat-lto-objects']
return flags

+ 36
- 0
patches/gst-opera_clone.sh View File

@@ -0,0 +1,36 @@
#!/bin/sh
git clone http://sourcecode.opera.com/gstreamer/gst-opera.git
cd gst-opera

# clone sub-modules manually
git clone http://sourcecode.opera.com/gstreamer/libogg.git
git clone http://sourcecode.opera.com/gstreamer/libvorbis.git
git clone http://sourcecode.opera.com/gstreamer/libtheora.git
git clone http://sourcecode.opera.com/gstreamer/glib.git
git clone http://sourcecode.opera.com/gstreamer/gstreamer.git
git clone http://sourcecode.opera.com/gstreamer/gst-plugins-base.git
git clone http://sourcecode.opera.com/gstreamer/gst-plugins-good.git

# gst-plugins-bad is borked, need to clone it a different way
# YOU NEED WGET INSTALLED FOR THIS TO WORK
wget -r http://sourcecode.opera.com/gstreamer/gst-plugins-bad.git -P gst-opera-bad1.git
git clone gst-opera-bad1.git/sourcecode.opera.com/gstreamer/gst-plugins-bad.git

# setup each sub-module repo to have correct code
cd glib
git checkout remotes/origin/2.20.5+OPERA

cd ../gst-plugins-bad
git checkout remotes/origin/RELEASE-0.10.19+OPERA

cd ../gst-plugins-base
git checkout remotes/origin/RELEASE-0.10.29+OPERA

cd ../gst-plugins-good
git checkout remotes/origin/RELEASE-0.10.23+OPERA

cd ../gstreamer
git checkout remotes/origin/RELEASE-0.10.29+OPERA

# done!
echo gst-opera clone finished!

+ 52
- 0
patches/gst-opera_instructions.txt View File

@@ -0,0 +1,52 @@
How to clone gst-opera fully:
(instead of reading this guide, under Windows you can just run gst-opera_clone.bat, Linux users can also try gst-opera_clone.sh)

IF you're reading this you probably noticed how trying to fully clone the Opera version of gstreamer (gst-opera) gives a lot of errors, I'll explain how to work around these below.

First, you should obviously have a working install of Git, whether through your package manager or a Windows installer.

Once Git is setup, clone the main gst-opera directory:
git clone http://sourcecode.opera.com/gstreamer/gst-opera.git

The naive way to continue is by following the steps shown at http://sourcecode.opera.com/gstreamer/, but we know those instructions don't work properly, so we have to do it another way.

First make sure you've changed into your gst-opera directory:
cd gst-opera

Now peek into the gst-opera/.gitmodules file to see what repos need to be cloned, make sure you've changed into your gst-opera folder, and then run the following:
git clone http://sourcecode.opera.com/gstreamer/libogg.git
git clone http://sourcecode.opera.com/gstreamer/libvorbis.git
git clone http://sourcecode.opera.com/gstreamer/libtheora.git
git clone http://sourcecode.opera.com/gstreamer/glib.git
git clone http://sourcecode.opera.com/gstreamer/gstreamer.git
git clone http://sourcecode.opera.com/gstreamer/gst-plugins-base.git
git clone http://sourcecode.opera.com/gstreamer/gst-plugins-good.git

The astute among you may have noticed that gst-plugins-bad is excluded from the list above, that's because it has to be cloned a different way:
Run all the commands above, and then run the following to download the server copy of gst-plugins-bad:
wget -r http://sourcecode.opera.com/gstreamer/gst-plugins-bad.git -P gst-opera-bad1.git

Now clone from that server copy:
git clone gst-opera-bad1.git/sourcecode.opera.com/gstreamer/gst-plugins-bad.git

Finally we'll setup each sub-repo:
cd glib
git checkout remotes/origin/2.20.5+OPERA

cd ../gst-plugins-bad
git checkout remotes/origin/RELEASE-0.10.19+OPERA

cd ../gst-plugins-base
git checkout remotes/origin/RELEASE-0.10.29+OPERA

cd ../gst-plugins-good
git checkout remotes/origin/RELEASE-0.10.23+OPERA

cd ../gstreamer
git checkout remotes/origin/RELEASE-0.10.29+OPERA

Now the gst-opera repo should be complete, and you should be able to compile from it no problem.

Enjoy!

- Xam

Write Preview
Loading…
Cancel
Save