sigrok-cross-mingw: Drop no longer needed patches.
authorUwe Hermann <uwe@hermann-uwe.de>
Sat, 3 Oct 2015 17:12:18 +0000 (19:12 +0200)
committerUwe Hermann <uwe@hermann-uwe.de>
Sat, 3 Oct 2015 17:12:18 +0000 (19:12 +0200)
cross-compile/mingw/libsigrok_firmwaredir.patch [deleted file]
cross-compile/mingw/sigrok-cross-mingw
cross-compile/mingw/srd_decodersdir.patch [deleted file]

diff --git a/cross-compile/mingw/libsigrok_firmwaredir.patch b/cross-compile/mingw/libsigrok_firmwaredir.patch
deleted file mode 100644 (file)
index 51d26b5..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index 9519056..334f4df 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -22,7 +22,7 @@ ACLOCAL_AMFLAGS = -I m4
- AM_LIBTOOLFLAGS = --silent
- MAKEFLAGS = --no-print-directory
--FIRMWARE_DIR = $(datadir)/sigrok-firmware
-+FIRMWARE_DIR = firmware
- local_includes = -Iinclude -I$(srcdir)/include -I$(srcdir)/src -I.
- if BINDINGS_CXX
index a7d625f3b95dc22c179d9f028f7eb729030997ab..66ce718509aa325077bb17e0360d8bef00a21979 100755 (executable)
@@ -135,7 +135,6 @@ cd ..
 # libsigrok
 $GIT_CLONE git://sigrok.org/libsigrok
 cd libsigrok
-patch -p1 < ../../libsigrok_firmwaredir.patch
 ./autogen.sh
 ./configure $C $L
 make $PARALLEL $V
@@ -146,7 +145,6 @@ cd ..
 $GIT_CLONE git://sigrok.org/libsigrokdecode
 cd libsigrokdecode
 ./autogen.sh
-patch -p1 < ../../srd_decodersdir.patch
 ./configure $C $L
 make $PARALLEL $V
 make install $V
diff --git a/cross-compile/mingw/srd_decodersdir.patch b/cross-compile/mingw/srd_decodersdir.patch
deleted file mode 100644 (file)
index 029db03..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-diff --git a/srd.c b/srd.c
-index f5b885f..1599957 100644
---- a/srd.c
-+++ b/srd.c
-@@ -140,16 +140,32 @@ SRD_API int srd_init(const char *path)
-       /* Add our own module to the list of built-in modules. */
-       PyImport_AppendInittab("sigrokdecode", PyInit_sigrokdecode);
-+      /*
-+       * MinGW: Hardcode the frontend's install dir as PYTHONHOME.
-+       * The NSIS installers will place python*.dll and python*.zip (which
-+       * contains all required libs and Python modules) there.
-+       *
-+       * Also hardcode that only the Python stdlib and the libsigrokdecode
-+       * PDs in the 'decoders' subdirectory in the frontend's install
-+       * directory are ever used/found by Python. This avoids various issues
-+       * with other Python libs and modules installed on the same system.
-+       */
-+
-       /* Initialize the Python interpreter. */
-+      Py_SetPythonHome(L".");
-       Py_Initialize();
-+      PyRun_SimpleString("import sys; sys.path = ['python32.zip']");
-+#if 0
-       /* Installed decoders. */
-       if ((ret = srd_decoder_searchpath_add(DECODERS_DIR)) != SRD_OK) {
-               Py_Finalize();
-               return ret;
-       }
-+#endif
-       /* Path specified by the user. */
-+      path = "decoders";
-       if (path) {
-               if ((ret = srd_decoder_searchpath_add(path)) != SRD_OK) {
-                       Py_Finalize();