diff options
author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-06-08 16:38:05 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-06-08 16:38:05 -0300 |
commit | c6e5d0d788ee2654a67bac4429d92f1f1df64c69 (patch) | |
tree | 84d3087e9c9f9aab24d69f83c8e7d1d7bde8dd17 /community/paraview | |
parent | 89bffd8b9efae5fd29ca78a4741839ca68eb108f (diff) | |
parent | bc83221d3c667b70e51dfff6ed212aada3906ee6 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-staging/kid3/kid3.install
community/cherokee/PKGBUILD
community/supercollider/supercollider.install
core/libusb/PKGBUILD
core/systemd/PKGBUILD
core/udev/PKGBUILD
extra/gimp-devel/PKGBUILD
extra/maxima/PKGBUILD
libre/kdenetwork-kopete-libre/PKGBUILD
staging/kdebase-workspace/kdm
staging/kdebindings-perlkde/PKGBUILD
staging/kdebindings-perlqt/PKGBUILD
staging/kdemultimedia/PKGBUILD
staging/kdenetwork/PKGBUILD
staging/kdeplasma-addons/kdeplasma-addons-applets.install
Diffstat (limited to 'community/paraview')
-rw-r--r-- | community/paraview/ffmpeg-0.8.diff | 66 | ||||
-rw-r--r-- | community/paraview/fix-build-with-zlib-1.2.6.diff | 36 |
2 files changed, 0 insertions, 102 deletions
diff --git a/community/paraview/ffmpeg-0.8.diff b/community/paraview/ffmpeg-0.8.diff deleted file mode 100644 index 523919d6f..000000000 --- a/community/paraview/ffmpeg-0.8.diff +++ /dev/null @@ -1,66 +0,0 @@ -Description: Upstream changes introduced in version 5.6.1-6.1 - This patch has been created by dpkg-source during the package build. - Here's the last changelog entry, hopefully it gives details on why - those changes were made: - . - vtk (5.6.1-6.1) unstable; urgency=low - . - [ Michael Schutte ] - * Non-maintainer upload. - * Remove absolute paths to required libraries from - /usr/lib/vtk-5.6/VTKLibraryDepends.cmake after building, closes: - #506992. Due to the multiarch transition, the original behavior - frequently causes reverse build-deps to FTBFS. This change should - probably be reverted once all required libraries are multiarched. - . - [ Steve M. Robbins ] - * Override lintian diagnostic about embedded libraries ftgl and sqlite. - * IO/vtkFFMPEGWriter.cxx: Applied fix from #638246 to build with libav - 0.7. - . - The person named in the Author field signed this changelog entry. -Author: Steve M. Robbins <smr@debian.org> -Bug-Debian: http://bugs.debian.org/506992 - ---- -The information above should follow the Patch Tagging Guidelines, please -checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here -are templates for supplementary fields that you might want to add: - -Origin: <vendor|upstream|other>, <url of original patch> -Bug: <url in upstream bugtracker> -Bug-Debian: http://bugs.debian.org/<bugnumber> -Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber> -Forwarded: <no|not-needed|url proving that it has been forwarded> -Reviewed-By: <name and email of someone who approved the patch> -Last-Update: <YYYY-MM-DD> - ---- vtk-5.6.1.orig/IO/vtkFFMPEGWriter.cxx -+++ vtk-5.6.1/IO/vtkFFMPEGWriter.cxx -@@ -123,7 +123,7 @@ int vtkFFMPEGWriterInternal::Start() - } - - //choose avi media file format -- this->avOutputFormat = guess_format("avi", NULL, NULL); -+ this->avOutputFormat = av_guess_format("avi", NULL, NULL); - if (!this->avOutputFormat) - { - vtkGenericWarningMacro (<< "Could not open the avi media file format."); -@@ -150,7 +150,7 @@ int vtkFFMPEGWriterInternal::Start() - //Set up the codec. - AVCodecContext *c = this->avStream->codec; - c->codec_id = (CodecID)this->avOutputFormat->video_codec; -- c->codec_type = CODEC_TYPE_VIDEO; -+ c->codec_type = AVMEDIA_TYPE_VIDEO; - c->width = this->Dim[0]; - c->height = this->Dim[1]; - c->pix_fmt = PIX_FMT_YUVJ420P; -@@ -329,7 +329,7 @@ int vtkFFMPEGWriterInternal::Write(vtkIm - pkt.stream_index = this->avStream->index; - if (cc->coded_frame->key_frame) //treat keyframes well - { -- pkt.flags |= PKT_FLAG_KEY; -+ pkt.flags |= AV_PKT_FLAG_KEY; - } - pkt.duration = 0; //presentation duration in time_base units or 0 if NA - pkt.pos = -1; //byte position in stream or -1 if NA diff --git a/community/paraview/fix-build-with-zlib-1.2.6.diff b/community/paraview/fix-build-with-zlib-1.2.6.diff deleted file mode 100644 index 6540de045..000000000 --- a/community/paraview/fix-build-with-zlib-1.2.6.diff +++ /dev/null @@ -1,36 +0,0 @@ ---- Utilities/VisItBridge/databases/BOV/avtBOVFileFormat.C.original 2012-02-09 16:22:56.420371795 +0000 -+++ Utilities/VisItBridge/databases/BOV/avtBOVFileFormat.C 2012-02-09 16:25:59.652228526 +0000 -@@ -703,10 +703,10 @@ - { - // Read past the specified offset. - if(byteOffset > 0) -- gzseek(gz_handle, byteOffset, SEEK_SET); -+ gzseek((gzFile)gz_handle, byteOffset, SEEK_SET); - - // Read the whole dataset -- gzread(gz_handle, whole_buff, whole_nelem * unit_size); -+ gzread((gzFile)gz_handle, whole_buff, whole_nelem * unit_size); - } - else - { -@@ -1046,9 +1046,9 @@ - { - // Read past the specified offset. - if(byteOffset > 0) -- gzseek(gz_handle, byteOffset, SEEK_SET); -+ gzseek((gzFile)gz_handle, byteOffset, SEEK_SET); - -- gzread(gz_handle, rv->GetVoidPointer(0), -+ gzread((gzFile)gz_handle, rv->GetVoidPointer(0), - nvals * dataNumComponents * unit_size); - } - else -@@ -1192,7 +1192,7 @@ - // Close the file descriptors. - // - if (gzipped) -- gzclose(gz_handle); -+ gzclose((gzFile)gz_handle); - else - fclose(file_handle); - |