[treewide] delete unused patches
This commit is contained in:
@@ -1,22 +0,0 @@
|
||||
diff --git a/supportlib/SConstruct b/supportlib/SConstruct
|
||||
index 7f797b9..07907e9 100644
|
||||
--- a/supportlib/SConstruct
|
||||
+++ b/supportlib/SConstruct
|
||||
@@ -5,7 +5,7 @@
|
||||
# library.
|
||||
######################################################################
|
||||
|
||||
-import sys, glob, os.path
|
||||
+import sys, glob, os.path, os
|
||||
|
||||
# Read the options
|
||||
vars = Variables("cpp_config.cfg")
|
||||
@@ -16,7 +16,7 @@ vars.Add("CPPPATH", "The include directories", [])
|
||||
vars.Add("MSVS_VERSION", "The preferred version of MS Visual Studio")
|
||||
|
||||
# Create the construction environment
|
||||
-env = Environment(variables = vars)
|
||||
+env = Environment(variables = vars, ENV = os.environ)
|
||||
|
||||
# Build the files in "obj"
|
||||
env.VariantDir("obj", "src", duplicate=0)
|
||||
@@ -1,42 +0,0 @@
|
||||
From daae1ae35e13bc8107dc97d9219dfb8e172d5d2a Mon Sep 17 00:00:00 2001
|
||||
From: Frederik Rietdijk <fridh@fridh.nl>
|
||||
Date: Tue, 14 Mar 2017 15:00:33 +0100
|
||||
Subject: [PATCH] namespace fix
|
||||
|
||||
configparser broke other namespace packages
|
||||
https://github.com/NixOS/nixpkgs/issues/23855#issuecomment-286427428
|
||||
This patch seems to solve that issue.
|
||||
---
|
||||
setup.py | 1 -
|
||||
src/backports/__init__.py | 6 ------
|
||||
2 files changed, 7 deletions(-)
|
||||
|
||||
diff --git a/setup.py b/setup.py
|
||||
index 3b07823..63ed25d 100644
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -42,7 +42,6 @@ setup(
|
||||
py_modules=modules,
|
||||
package_dir={'': 'src'},
|
||||
packages=find_packages('src'),
|
||||
- namespace_packages=['backports'],
|
||||
include_package_data=True,
|
||||
zip_safe=False,
|
||||
install_requires=requirements,
|
||||
diff --git a/src/backports/__init__.py b/src/backports/__init__.py
|
||||
index f84d25c..febdb2f 100644
|
||||
--- a/src/backports/__init__.py
|
||||
+++ b/src/backports/__init__.py
|
||||
@@ -3,9 +3,3 @@
|
||||
|
||||
from pkgutil import extend_path
|
||||
__path__ = extend_path(__path__, __name__)
|
||||
-
|
||||
-try:
|
||||
- import pkg_resources
|
||||
- pkg_resources.declare_namespace(__name__)
|
||||
-except ImportError:
|
||||
- pass
|
||||
--
|
||||
2.11.1
|
||||
|
||||
@@ -1,88 +0,0 @@
|
||||
diff -crB pygame-1.9.1release/Setup.in pygame-1.9.1release-v4lpatch//Setup.in
|
||||
*** pygame-1.9.1release/Setup.in Thu Jul 2 06:41:56 2009
|
||||
--- pygame-1.9.1release-v4lpatch//Setup.in Thu Mar 24 17:31:22 2011
|
||||
***************
|
||||
*** 34,40 ****
|
||||
_numericsndarray src/_numericsndarray.c $(SDL) $(MIXER) $(DEBUG)
|
||||
movie src/movie.c $(SDL) $(SMPEG) $(DEBUG)
|
||||
scrap src/scrap.c $(SDL) $(SCRAP) $(DEBUG)
|
||||
! _camera src/_camera.c src/camera_v4l2.c src/camera_v4l.c $(SDL) $(DEBUG)
|
||||
pypm src/pypm.c $(SDL) $(PORTMIDI) $(PORTTIME) $(DEBUG)
|
||||
|
||||
GFX = src/SDL_gfx/SDL_gfxPrimitives.c
|
||||
--- 34,40 ----
|
||||
_numericsndarray src/_numericsndarray.c $(SDL) $(MIXER) $(DEBUG)
|
||||
movie src/movie.c $(SDL) $(SMPEG) $(DEBUG)
|
||||
scrap src/scrap.c $(SDL) $(SCRAP) $(DEBUG)
|
||||
! _camera src/_camera.c src/camera_v4l2.c $(SDL) $(DEBUG)
|
||||
pypm src/pypm.c $(SDL) $(PORTMIDI) $(PORTTIME) $(DEBUG)
|
||||
|
||||
GFX = src/SDL_gfx/SDL_gfxPrimitives.c
|
||||
diff -crB pygame-1.9.1release/src/_camera.c pygame-1.9.1release-v4lpatch//src/_camera.c
|
||||
*** pygame-1.9.1release/src/_camera.c Sun Mar 15 20:30:41 2009
|
||||
--- pygame-1.9.1release-v4lpatch//src/_camera.c Thu Mar 24 16:58:18 2011
|
||||
***************
|
||||
*** 160,179 ****
|
||||
{
|
||||
#if defined(__unix__)
|
||||
if (v4l2_open_device(self) == 0) {
|
||||
! if (v4l_open_device(self) == 0) {
|
||||
! v4l2_close_device(self);
|
||||
! return NULL;
|
||||
! } else {
|
||||
! self->camera_type = CAM_V4L;
|
||||
! if (v4l_init_device(self) == 0) {
|
||||
! v4l2_close_device(self);
|
||||
! return NULL;
|
||||
! }
|
||||
! if (v4l_start_capturing(self) == 0) {
|
||||
! v4l2_close_device(self);
|
||||
! return NULL;
|
||||
! }
|
||||
! }
|
||||
} else {
|
||||
self->camera_type = CAM_V4L2;
|
||||
if (v4l2_init_device(self) == 0) {
|
||||
--- 160,167 ----
|
||||
{
|
||||
#if defined(__unix__)
|
||||
if (v4l2_open_device(self) == 0) {
|
||||
! v4l2_close_device(self);
|
||||
! return NULL;
|
||||
} else {
|
||||
self->camera_type = CAM_V4L2;
|
||||
if (v4l2_init_device(self) == 0) {
|
||||
diff -crB pygame-1.9.1release/src/camera.h pygame-1.9.1release-v4lpatch//src/camera.h
|
||||
*** pygame-1.9.1release/src/camera.h Fri Oct 10 04:37:10 2008
|
||||
--- pygame-1.9.1release-v4lpatch//src/camera.h Thu Mar 24 16:44:32 2011
|
||||
***************
|
||||
*** 39,45 ****
|
||||
|
||||
#include <asm/types.h> /* for videodev2.h */
|
||||
|
||||
- #include <linux/videodev.h>
|
||||
#include <linux/videodev2.h>
|
||||
#endif
|
||||
|
||||
--- 39,44 ----
|
||||
***************
|
||||
*** 51,57 ****
|
||||
#define RGB_OUT 1
|
||||
#define YUV_OUT 2
|
||||
#define HSV_OUT 4
|
||||
- #define CAM_V4L 1
|
||||
#define CAM_V4L2 2
|
||||
|
||||
struct buffer
|
||||
--- 50,55 ----
|
||||
***************
|
||||
*** 111,118 ****
|
||||
int v4l2_close_device (PyCameraObject* self);
|
||||
int v4l2_open_device (PyCameraObject* self);
|
||||
|
||||
- /* internal functions specific to v4l */
|
||||
- int v4l_open_device (PyCameraObject* self);
|
||||
- int v4l_init_device(PyCameraObject* self);
|
||||
- int v4l_start_capturing(PyCameraObject* self);
|
||||
#endif
|
||||
--- 109,112 ----
|
||||
@@ -1,12 +0,0 @@
|
||||
diff --git a/setup.py b/setup.py
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -18,7 +18,7 @@ from version import VERSION # NOQA
|
||||
install_requires = [
|
||||
'pandas >= 0.14',
|
||||
'numpy >= 1.8',
|
||||
- 'requests >= 2.7.0, < 2.18', # Version 2.18 appears to break pulling data.
|
||||
+ 'requests >= 2.7.0', # Works fine
|
||||
'inflection >= 0.3.1',
|
||||
'python-dateutil',
|
||||
'six',
|
||||
Reference in New Issue
Block a user