diff options
-rw-r--r-- | media-libs/opencv/opencv-2.4.11.ebuild | 8 | ||||
-rw-r--r-- | media-libs/opencv/opencv-2.4.12-r1.ebuild | 2 | ||||
-rw-r--r-- | media-libs/opencv/opencv-2.4.12.ebuild | 8 | ||||
-rw-r--r-- | media-libs/opencv/opencv-3.1.0-r1.ebuild | 2 | ||||
-rw-r--r-- | media-libs/opencv/opencv-3.1.0-r4.ebuild | 2 |
5 files changed, 11 insertions, 11 deletions
diff --git a/media-libs/opencv/opencv-2.4.11.ebuild b/media-libs/opencv/opencv-2.4.11.ebuild index 225533b0034..262d90f9cac 100644 --- a/media-libs/opencv/opencv-2.4.11.ebuild +++ b/media-libs/opencv/opencv-2.4.11.ebuild @@ -80,10 +80,10 @@ pkg_setup() { src_prepare() { epatch "${FILESDIR}/${PN}-2.3.1a-libav-0.7.patch" \ - "${FILESDIR}/${PN}-2.4.3-gcc47.patch" \ - "${FILESDIR}/${PN}-2.4.2-cflags.patch" \ - "${FILESDIR}/${PN}-2.4.8-javamagic.patch" \ - "${FILESDIR}/${PN}-2.4.9-cuda-pkg-config.patch" \ + "${FILESDIR}/${PN}-2.4.3-gcc47.patch" \ + "${FILESDIR}/${PN}-2.4.2-cflags.patch" \ + "${FILESDIR}/${PN}-2.4.8-javamagic.patch" \ + "${FILESDIR}/${PN}-2.4.9-cuda-pkg-config.patch" \ "${FILESDIR}/${P}-git-autodetect.patch" # remove bundled stuff diff --git a/media-libs/opencv/opencv-2.4.12-r1.ebuild b/media-libs/opencv/opencv-2.4.12-r1.ebuild index 16b48f7896b..916ef267ef4 100644 --- a/media-libs/opencv/opencv-2.4.12-r1.ebuild +++ b/media-libs/opencv/opencv-2.4.12-r1.ebuild @@ -197,7 +197,7 @@ src_configure() { if use cuda; then if [[ "$(gcc-version)" > "4.8" ]]; then - # bug 577410 + # bug 577410 # #error -- unsupported GNU version! gcc 4.9 and up are not supported! ewarn "CUDA and >=sys-devel/gcc-4.9 do not play well together. Disabling CUDA support." mycmakeargs+=( -DWITH_CUDA=OFF ) diff --git a/media-libs/opencv/opencv-2.4.12.ebuild b/media-libs/opencv/opencv-2.4.12.ebuild index d05c6eae154..71bfde0f0f1 100644 --- a/media-libs/opencv/opencv-2.4.12.ebuild +++ b/media-libs/opencv/opencv-2.4.12.ebuild @@ -80,10 +80,10 @@ pkg_setup() { src_prepare() { epatch "${FILESDIR}/${PN}-2.3.1a-libav-0.7.patch" \ - "${FILESDIR}/${PN}-2.4.3-gcc47.patch" \ - "${FILESDIR}/${PN}-2.4.2-cflags.patch" \ - "${FILESDIR}/${PN}-2.4.8-javamagic.patch" \ - "${FILESDIR}/${PN}-2.4.9-cuda-pkg-config.patch" \ + "${FILESDIR}/${PN}-2.4.3-gcc47.patch" \ + "${FILESDIR}/${PN}-2.4.2-cflags.patch" \ + "${FILESDIR}/${PN}-2.4.8-javamagic.patch" \ + "${FILESDIR}/${PN}-2.4.9-cuda-pkg-config.patch" \ "${FILESDIR}/${P}-git-autodetect.patch" # remove bundled stuff diff --git a/media-libs/opencv/opencv-3.1.0-r1.ebuild b/media-libs/opencv/opencv-3.1.0-r1.ebuild index 5ad4655a89e..4ed36c877c9 100644 --- a/media-libs/opencv/opencv-3.1.0-r1.ebuild +++ b/media-libs/opencv/opencv-3.1.0-r1.ebuild @@ -94,7 +94,7 @@ pkg_setup() { src_prepare() { epatch "${FILESDIR}/${PN}-3.0.0-gles.patch" \ - "${FILESDIR}/${PN}-3.1.0-cmake-no-opengl.patch" \ + "${FILESDIR}/${PN}-3.1.0-cmake-no-opengl.patch" \ "${FILESDIR}/${P}-git-autodetect.patch" # remove bundled stuff diff --git a/media-libs/opencv/opencv-3.1.0-r4.ebuild b/media-libs/opencv/opencv-3.1.0-r4.ebuild index 0032bd69fef..535596660ae 100644 --- a/media-libs/opencv/opencv-3.1.0-r4.ebuild +++ b/media-libs/opencv/opencv-3.1.0-r4.ebuild @@ -209,7 +209,7 @@ src_configure() { if use cuda; then if [[ "$(gcc-version)" > "4.8" ]]; then - # bug 577410 + # bug 577410 # #error -- unsupported GNU version! gcc 4.9 and up are not supported! ewarn "CUDA and >=sys-devel/gcc-4.9 do not play well together. Disabling CUDA support." mycmakeargs+=( -DWITH_CUDA=OFF ) |