summaryrefslogtreecommitdiff
path: root/x11/xpra/files/patch-xpra_codecs_enc__ffmpeg_encoder.pyx
diff options
context:
space:
mode:
authorRene Ladan <rene@FreeBSD.org>2018-12-21 13:19:02 +0000
committerRene Ladan <rene@FreeBSD.org>2018-12-21 13:19:02 +0000
commite5aaf05932b27919e9237fe077f607ac0f0d8e91 (patch)
tree094c99154e533e4d74dec6f4cc4c2f945ffea1b1 /x11/xpra/files/patch-xpra_codecs_enc__ffmpeg_encoder.pyx
parentwww/node8: fix build on powerpc64 (diff)
Remove expired ports:
2018-12-19 net/py-libstorj: Broken for more than 6 months 2018-12-20 net/xferstats: Uses obsolete glib12 2018-12-20 net/wmlj: Uses obsolete glib12 2018-12-20 net/ipsorc: Uses obsolete glib12 2018-12-20 net/bsdproxy: Uses obsolete glib12 2018-12-20 net/gini: Uses obsolete glib12 2018-12-21 net/netatalk: Outdated branch of netatalk; use net/netatalk3 instead 2018-12-20 net/nocatsplash: Uses obsolete glib12 2018-12-20 net/jags: Uses obsolete glib12 2018-12-19 net/scribe: Broken for more than 6 months 2018-12-20 net/libnetdude: Uses obsolete glib12 2018-12-20 net/nepim: Uses obsolete glib12 2018-12-20 emulators/generator: Uses obsolete glib12 2018-12-19 emulators/py-nova: Broken for more than 6 months 2018-12-20 emulators/generator-cbiere: Uses obsolete glib12 2018-12-20 x11-toolkits/p5-Gtk-Perl: Uses obsolete glib12 2018-12-20 deskutils/ithought: Uses obsolete glib12 2018-12-20 deskutils/gaddr: Uses obsolete glib12 2018-12-20 x11-fonts/gfe: Uses obsolete glib12 2018-12-20 graphics/graphopt: Uses obsolete glib12 2018-12-19 graphics/fotoxx: Broken for more than 6 months 2018-12-20 graphics/gcolor: Uses obsolete glib12 2018-12-20 graphics/danpei: Uses obsolete glib12 2018-12-20 graphics/chbg: Uses obsolete glib12 2018-12-20 mail/pop3lite: Uses obsolete glib12 2018-12-20 mail/gbuffy: Uses obsolete glib12 2018-12-20 security/gtk-knocker: Uses obsolete glib12 2018-12-20 security/gpasman: Uses obsolete glib12 2018-12-20 security/crank: Uses obsolete glib12 2018-12-20 security/stegdetect: Uses obsolete glib12 2018-12-20 devel/liboop: Uses obsolete glib12 2018-12-20 devel/gcvs: Uses obsolete glib12 2018-12-20 print/lpr-wrapper: Uses obsolete glib12 2018-12-20 print/libppd: Uses obsolete glib12 2018-12-20 net-p2p/napshare: Uses obsolete glib12 2018-12-20 net-p2p/gnewtellium: Uses obsolete glib12 2018-12-20 editors/gnotepad+: Uses obsolete glib12 2018-12-20 editors/manedit: Uses obsolete glib12 2018-12-20 misc/gtkfind: Uses obsolete glib12 2018-12-20 games/mindguard: Uses obsolete glib12 2018-12-20 games/xbattle: Uses obsolete glib12 2018-12-20 games/xbill: Uses obsolete glib12 2018-12-20 games/corewars: Uses obsolete glib12 2018-12-20 games/dopewars: Uses obsolete glib12 2018-12-20 games/garith: Uses obsolete glib12 2018-12-20 games/wmquake: Uses obsolete glib12 2018-12-20 games/znibbles: Uses obsolete glib12 2018-12-20 games/xpuyopuyo: Uses obsolete glib12 2018-12-19 games/kajongg: Broken for more than 6 months 2018-12-20 games/netspades: Uses obsolete glib12 2018-12-20 games/gtklife: Uses obsolete glib12 2018-12-20 biology/xmolwt: Uses obsolete glib12 2018-12-20 x11-clocks/wmclockmon: Uses obsolete glib12 2018-12-20 x11-clocks/asclock-gtk: Uses obsolete glib12 2018-12-20 net-im/gale: Uses obsolete glib12 2018-12-20 audio/xmms-ahx: Uses obsolete glib12 2018-12-20 audio/xmms-curses: Uses obsolete glib12 2018-12-20 audio/scrobbler: Uses obsolete glib12 2018-12-20 audio/xmms-nsf: Uses obsolete glib12 2018-12-20 audio/xmms-nas: Uses obsolete glib12 2018-12-20 audio/xmms-gbsplay: Uses obsolete glib12 2018-12-20 audio/xmms-wavpack: Uses obsolete glib12 2018-12-20 audio/xmms-shn: Uses obsolete glib12 2018-12-20 audio/xmms-volnorm: Uses obsolete glib12 2018-12-20 audio/xmms-faad: Uses obsolete glib12 2018-12-20 audio/xmms-scrobbler: Uses obsolete glib12 2018-12-20 audio/mcplay: Uses obsolete glib12 2018-12-20 audio/gmixer: Uses obsolete glib12 2018-12-20 audio/soundtracker: Uses obsolete glib12 2018-12-20 audio/xmms-sapplug: Uses obsolete glib12 2018-12-20 audio/rio500: Uses obsolete glib12 2018-12-20 audio/xmmsctrl: Uses obsolete glib12 2018-12-20 audio/xmms-xf86audio: Uses obsolete glib12 2018-12-20 audio/xmms-mailnotify: Uses obsolete glib12 2018-12-20 audio/xmms-sexypsf: Uses obsolete glib12 2018-12-20 audio/gqmpeg: Uses obsolete glib12 2018-12-20 audio/wmalbum: Uses obsolete glib12 2018-12-20 audio/xmms-xymms: Uses obsolete glib12 2018-12-20 audio/xmms-flac: Uses obsolete glib12 2018-12-20 audio/xmms-festalon: Uses obsolete glib12 2018-12-20 audio/gkrellmms2: Uses obsolete glib12 2018-12-20 audio/xmms-ladspa: Uses obsolete glib12 2018-12-19 math/octave-forge-engine: Broken for more than 6 months 2018-12-20 math/surf: Uses obsolete glib12 2018-12-19 math/msieve: Broken for more than 6 months 2018-12-19 math/octave-forge-fl-core: Broken for more than 6 months 2018-12-19 math/octave-forge-pdb: Broken for more than 6 months 2018-12-19 math/octave-forge-audio: Broken for more than 6 months 2018-12-20 math/geg: Uses obsolete glib12 2018-12-20 math/grpn: Uses obsolete glib12 2018-12-20 x11/gdkxft: Uses obsolete glib12 2018-12-20 x11/gtk-theme-switch: Uses obsolete glib12 2018-12-19 x11/xpyb: Broken for more than 6 months 2018-12-20 x11/gtk-launch: Uses obsolete glib12 2018-12-19 x11/xpra: Broken for more than 6 months 2018-12-20 palm/pilrc: Uses obsolete glib12 2018-12-20 x11-fm/mtoolsfm: Uses obsolete glib12 2018-12-20 german/steak: Uses obsolete glib12 2018-12-20 multimedia/xmms-skins-huge: Uses obsolete glib12 2018-12-20 multimedia/openquicktime: Uses obsolete glib12 2018-12-20 multimedia/xmms-skins: Uses obsolete glib12 2018-12-20 multimedia/oqtplayer: Uses obsolete glib12 2018-12-20 multimedia/oqtencoder: Uses obsolete glib12 2018-12-20 multimedia/p5-Video-OpenQuicktime: Uses obsolete glib12 2018-12-20 multimedia/xtheater: Uses obsolete glib12 2018-12-20 multimedia/dv2jpg: Uses obsolete glib12 2018-12-20 comms/hf: Uses obsolete glib12 2018-12-20 comms/gscmxx: Uses obsolete glib12 2018-12-20 sysutils/wmcube-gdk: Uses obsolete glib12 2018-12-20 sysutils/gcombust: Uses obsolete glib12 2018-12-20 sysutils/xlogmaster: Uses obsolete glib12 2018-12-20 sysutils/mount.app: Uses obsolete glib12 2018-12-20 sysutils/bbapm: Uses obsolete glib12
Diffstat (limited to 'x11/xpra/files/patch-xpra_codecs_enc__ffmpeg_encoder.pyx')
-rw-r--r--x11/xpra/files/patch-xpra_codecs_enc__ffmpeg_encoder.pyx185
1 files changed, 0 insertions, 185 deletions
diff --git a/x11/xpra/files/patch-xpra_codecs_enc__ffmpeg_encoder.pyx b/x11/xpra/files/patch-xpra_codecs_enc__ffmpeg_encoder.pyx
deleted file mode 100644
index ba529472090b..000000000000
--- a/x11/xpra/files/patch-xpra_codecs_enc__ffmpeg_encoder.pyx
+++ /dev/null
@@ -1,185 +0,0 @@
-https://www.xpra.org/trac/changeset/18088/xpra
-
---- xpra/codecs/enc_ffmpeg/encoder.pyx.orig 2017-03-17 07:24:28 UTC
-+++ xpra/codecs/enc_ffmpeg/encoder.pyx
-@@ -134,44 +134,36 @@ cdef extern from "libavcodec/avcodec.h":
- int FF_PROFILE_H264_HIGH_444_INTRA
- int FF_PROFILE_H264_CAVLC_444
-
-- int CODEC_FLAG_UNALIGNED
-- int CODEC_FLAG_QSCALE
-- int CODEC_FLAG_4MV
-- int CODEC_FLAG_OUTPUT_CORRUPT
-- int CODEC_FLAG_QPEL
-- int CODEC_FLAG_GMC
-- int CODEC_FLAG_MV0
-- int CODEC_FLAG_INPUT_PRESERVED
-- int CODEC_FLAG_PASS1
-- int CODEC_FLAG_PASS2
-- int CODEC_FLAG_GRAY
-- int CODEC_FLAG_EMU_EDGE
-- int CODEC_FLAG_PSNR
-- int CODEC_FLAG_TRUNCATED
-- int CODEC_FLAG_NORMALIZE_AQP
-- int CODEC_FLAG_INTERLACED_DCT
-- int CODEC_FLAG_GLOBAL_HEADER
-+ int AV_CODEC_FLAG_UNALIGNED
-+ int AV_CODEC_FLAG_QSCALE
-+ int AV_CODEC_FLAG_4MV
-+ int AV_CODEC_FLAG_OUTPUT_CORRUPT
-+ int AV_CODEC_FLAG_QPEL
-+ int AV_CODEC_FLAG_PASS1
-+ int AV_CODEC_FLAG_PASS2
-+ int AV_CODEC_FLAG_GRAY
-+ int AV_CODEC_FLAG_PSNR
-+ int AV_CODEC_FLAG_TRUNCATED
-+ int AV_CODEC_FLAG_INTERLACED_DCT
-+ int AV_CODEC_FLAG_GLOBAL_HEADER
-
-- int CODEC_FLAG2_FAST
-+ int AV_CODEC_FLAG2_FAST
-
-- int CODEC_CAP_DRAW_HORIZ_BAND
-- int CODEC_CAP_DR1
-- int CODEC_CAP_TRUNCATED
-- int CODEC_CAP_HWACCEL
-- int CODEC_CAP_DELAY
-- int CODEC_CAP_SMALL_LAST_FRAME
-- int CODEC_CAP_HWACCEL_VDPAU
-- int CODEC_CAP_SUBFRAMES
-- int CODEC_CAP_EXPERIMENTAL
-- int CODEC_CAP_CHANNEL_CONF
-- int CODEC_CAP_NEG_LINESIZES
-- int CODEC_CAP_FRAME_THREADS
-- int CODEC_CAP_SLICE_THREADS
-- int CODEC_CAP_PARAM_CHANGE
-- int CODEC_CAP_AUTO_THREADS
-- int CODEC_CAP_VARIABLE_FRAME_SIZE
-- int CODEC_CAP_INTRA_ONLY
-- int CODEC_CAP_LOSSLESS
-+ int AV_CODEC_CAP_DRAW_HORIZ_BAND
-+ int AV_CODEC_CAP_DR1
-+ int AV_CODEC_CAP_TRUNCATED
-+ int AV_CODEC_CAP_DELAY
-+ int AV_CODEC_CAP_SMALL_LAST_FRAME
-+ int AV_CODEC_CAP_SUBFRAMES
-+ int AV_CODEC_CAP_EXPERIMENTAL
-+ int AV_CODEC_CAP_CHANNEL_CONF
-+ int AV_CODEC_CAP_FRAME_THREADS
-+ int AV_CODEC_CAP_SLICE_THREADS
-+ int AV_CODEC_CAP_PARAM_CHANGE
-+ int AV_CODEC_CAP_AUTO_THREADS
-+ int AV_CODEC_CAP_VARIABLE_FRAME_SIZE
-+ int AV_CODEC_CAP_INTRA_ONLY
-+ int AV_CODEC_CAP_LOSSLESS
-
- ctypedef struct AVFrame:
- uint8_t **data
-@@ -385,7 +377,6 @@ cdef extern from "libavformat/avformat.h":
- int AVFMT_NOFILE #Demuxer will use avio_open, no opened file should be provided by the caller
- int AVFMT_NEEDNUMBER #Needs '%d' in filename
- int AVFMT_SHOW_IDS #Show format stream IDs numbers
-- int AVFMT_RAWPICTURE #Format wants AVPicture structure for raw picture data. @deprecated Not used anymore
- int AVFMT_GLOBALHEADER #Format wants global header
- int AVFMT_NOTIMESTAMPS #Format does not need / have any timestamps
- int AVFMT_GENERIC_INDEX #Use generic index building code
-@@ -489,27 +480,22 @@ AVFMTCTX = {
- }
-
- CODEC_FLAGS = {
-- CODEC_FLAG_UNALIGNED : "UNALIGNED",
-- CODEC_FLAG_QSCALE : "QSCALE",
-- CODEC_FLAG_4MV : "4MV",
-- CODEC_FLAG_OUTPUT_CORRUPT : "OUTPUT_CORRUPT",
-- CODEC_FLAG_QPEL : "QPEL",
-- CODEC_FLAG_GMC : "GMC",
-- CODEC_FLAG_MV0 : "MV0",
-- CODEC_FLAG_INPUT_PRESERVED : "INPUT_PRESERVED",
-- CODEC_FLAG_PASS1 : "PASS1",
-- CODEC_FLAG_PASS2 : "PASS2",
-- CODEC_FLAG_GRAY : "GRAY",
-- CODEC_FLAG_EMU_EDGE : "EMU_EDGE",
-- CODEC_FLAG_PSNR : "PSNR",
-- CODEC_FLAG_TRUNCATED : "TRUNCATED",
-- CODEC_FLAG_NORMALIZE_AQP : "NORMALIZE_AQP",
-- CODEC_FLAG_INTERLACED_DCT : "INTERLACED_DCT",
-- CODEC_FLAG_GLOBAL_HEADER : "GLOBAL_HEADER",
-+ AV_CODEC_FLAG_UNALIGNED : "UNALIGNED",
-+ AV_CODEC_FLAG_QSCALE : "QSCALE",
-+ AV_CODEC_FLAG_4MV : "4MV",
-+ AV_CODEC_FLAG_OUTPUT_CORRUPT : "OUTPUT_CORRUPT",
-+ AV_CODEC_FLAG_QPEL : "QPEL",
-+ AV_CODEC_FLAG_PASS1 : "PASS1",
-+ AV_CODEC_FLAG_PASS2 : "PASS2",
-+ AV_CODEC_FLAG_GRAY : "GRAY",
-+ AV_CODEC_FLAG_PSNR : "PSNR",
-+ AV_CODEC_FLAG_TRUNCATED : "TRUNCATED",
-+ AV_CODEC_FLAG_INTERLACED_DCT : "INTERLACED_DCT",
-+ AV_CODEC_FLAG_GLOBAL_HEADER : "GLOBAL_HEADER",
- }
-
- CODEC_FLAGS2 = {
-- CODEC_FLAG2_FAST : "FAST",
-+ AV_CODEC_FLAG2_FAST : "FAST",
- }
-
- FMT_FLAGS = {
-@@ -535,7 +521,6 @@ AVFMT = {
- AVFMT_NOFILE : "NOFILE",
- AVFMT_NEEDNUMBER : "NEEDNUMBER",
- AVFMT_SHOW_IDS : "SHOW_IDS",
-- AVFMT_RAWPICTURE : "RAWPICTURE",
- AVFMT_GLOBALHEADER : "GLOBALHEADER",
- AVFMT_NOTIMESTAMPS : "NOTIMESTAMPS",
- AVFMT_GENERIC_INDEX : "GENERIC_INDEX",
-@@ -554,24 +539,21 @@ AVFMT = {
-
-
- CAPS = {
-- CODEC_CAP_DRAW_HORIZ_BAND : "DRAW_HORIZ_BAND",
-- CODEC_CAP_DR1 : "DR1",
-- CODEC_CAP_TRUNCATED : "TRUNCATED",
-- CODEC_CAP_HWACCEL : "HWACCEL",
-- CODEC_CAP_DELAY : "DELAY",
-- CODEC_CAP_SMALL_LAST_FRAME : "SMALL_LAST_FRAME",
-- CODEC_CAP_HWACCEL_VDPAU : "HWACCEL_VDPAU",
-- CODEC_CAP_SUBFRAMES : "SUBFRAMES",
-- CODEC_CAP_EXPERIMENTAL : "EXPERIMENTAL",
-- CODEC_CAP_CHANNEL_CONF : "CHANNEL_CONF",
-- CODEC_CAP_NEG_LINESIZES : "NEG_LINESIZES",
-- CODEC_CAP_FRAME_THREADS : "FRAME_THREADS",
-- CODEC_CAP_SLICE_THREADS : "SLICE_THREADS",
-- CODEC_CAP_PARAM_CHANGE : "PARAM_CHANGE",
-- CODEC_CAP_AUTO_THREADS : "AUTO_THREADS",
-- CODEC_CAP_VARIABLE_FRAME_SIZE : "VARIABLE_FRAME_SIZE",
-- CODEC_CAP_INTRA_ONLY : "INTRA_ONLY",
-- CODEC_CAP_LOSSLESS : "LOSSLESS",
-+ AV_CODEC_CAP_DRAW_HORIZ_BAND : "DRAW_HORIZ_BAND",
-+ AV_CODEC_CAP_DR1 : "DR1",
-+ AV_CODEC_CAP_TRUNCATED : "TRUNCATED",
-+ AV_CODEC_CAP_DELAY : "DELAY",
-+ AV_CODEC_CAP_SMALL_LAST_FRAME : "SMALL_LAST_FRAME",
-+ AV_CODEC_CAP_SUBFRAMES : "SUBFRAMES",
-+ AV_CODEC_CAP_EXPERIMENTAL : "EXPERIMENTAL",
-+ AV_CODEC_CAP_CHANNEL_CONF : "CHANNEL_CONF",
-+ AV_CODEC_CAP_FRAME_THREADS : "FRAME_THREADS",
-+ AV_CODEC_CAP_SLICE_THREADS : "SLICE_THREADS",
-+ AV_CODEC_CAP_PARAM_CHANGE : "PARAM_CHANGE",
-+ AV_CODEC_CAP_AUTO_THREADS : "AUTO_THREADS",
-+ AV_CODEC_CAP_VARIABLE_FRAME_SIZE : "VARIABLE_FRAME_SIZE",
-+ AV_CODEC_CAP_INTRA_ONLY : "INTRA_ONLY",
-+ AV_CODEC_CAP_LOSSLESS : "LOSSLESS",
- }
- log("CODEC_CAP:")
- print_nested_dict(dict((hex(abs(k)),v) for k,v in CAPS.items()), print_fn=log.debug)
-@@ -890,8 +872,8 @@ cdef class Encoder(object):
- self.video_ctx.thread_type = THREAD_TYPE
- self.video_ctx.thread_count = THREAD_COUNT #0=auto
- #if oformat.flags & AVFMT_GLOBALHEADER:
-- self.video_ctx.flags |= CODEC_FLAG_GLOBAL_HEADER
-- self.video_ctx.flags2 |= CODEC_FLAG2_FAST #may cause "no deblock across slices" - which should be fine
-+ self.video_ctx.flags |= AV_CODEC_FLAG_GLOBAL_HEADER
-+ self.video_ctx.flags2 |= AV_CODEC_FLAG2_FAST #may cause "no deblock across slices" - which should be fine
- if self.encoding.startswith("h264") and profile:
- r = av_dict_set(&opts, b"vprofile", strtobytes(profile), 0)
- log("av_dict_set vprofile=%s returned %i", profile, r)