Skip to content

Commit

Permalink
#1256: use private ffmpeg library, finally something up to date
Browse files Browse the repository at this point in the history
git-svn-id: https://xpra.org/svn/Xpra/trunk@13012 3bb7dfac-3a0b-4e04-842a-767bc560f471
  • Loading branch information
totaam committed Jul 14, 2016
1 parent 5e3985b commit 4abb030
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
13 changes: 5 additions & 8 deletions debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ Maintainer: Antoine Martin <[email protected]>
Build-Depends: debhelper (>= 8)
,quilt
,cython (>= 0.16)
,libavcodec-dev
,libswscale-dev
,ffmpeg-xpra
,libx11-dev
,libvpx-dev
,libxcomposite-dev
Expand Down Expand Up @@ -40,6 +39,8 @@ Depends: ${misc:Depends}, ${python:Depends}, ${shlibs:Depends}
,python-numpy
# for PNG and JPEG support:
,python-imaging
# ffmpeg based codecs:
,ffmpeg-xpra
# packet encoder:
,python-rencode
#depend on lz4 for those that have it, lzo otherwise:
Expand All @@ -53,23 +54,19 @@ Depends: ${misc:Depends}, ${python:Depends}, ${shlibs:Depends}
#wily: ,python-appindicator
#xenial: ,python-appindicator
Recommends:
#version specific values (sigh), uncomment the one you need:
#jessie: ,libswscale3
#stretch: ,libswscale-ffmpeg3
#trusty: ,libswscale2
#wily: ,libswscale-ffmpeg3
#xenial: ,libswscale-ffmpeg3
#x264
#jessie: ,libx264-142
#stretch: ,libx264-146
#trusty: ,libx264-142
#wily: ,libx264-148
#xenial: ,libx264-148
,libxvidcore4
#webp
#jessie: ,libwebp5
#stretch: ,libwebp5
#trusty: ,libwebp5
#wily: ,libwebp5
#xenial: ,libwebp5
#AES encryption:
#jessie: ,python-cryptography
#stretch: ,python-cryptography
Expand Down
3 changes: 3 additions & 0 deletions debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ override_dh_auto_build:
override_dh_installchangelogs:
dh_installchangelogs NEWS

override_dh_shlibdeps:
dh_shlibdeps -l /usr/lib/xpra

override_dh_auto_install:
dh_auto_install --destdir=$(CURDIR)/debian/tmp -- $(BUILDOPTS)

Expand Down

0 comments on commit 4abb030

Please sign in to comment.