lp:~laney/ubuntu/quantal/gst-plugins-good0.10/merge-0.10.31-3
- Get this branch:
- bzr branch lp:~laney/ubuntu/quantal/gst-plugins-good0.10/merge-0.10.31-3
Branch merges
- Martin Pitt: Approve
-
Diff: 46854 lines (+1822/-44240)111 files modified.pc/0001-pulsesrc-Listen-to-source-output-events-not-sink-inp.patch/ext/pulse/pulsesrc.c (+1750/-0)
.pc/04_move_farsight_plugins_to_good.patch/Makefile.am (+0/-95)
.pc/04_move_farsight_plugins_to_good.patch/configure.ac (+0/-1264)
.pc/05_move_shm_to_good.patch/configure.ac (+0/-1269)
.pc/05_move_shm_to_good.patch/sys/Makefile.am (+0/-84)
.pc/07_move-camerabin.patch/Makefile.am (+0/-96)
.pc/07_move-camerabin.patch/configure.ac (+0/-1277)
.pc/99_ltmain_as-needed.patch/ltmain.sh (+0/-9661)
.pc/applied-patches (+1/-4)
Makefile.am (+6/-3)
configure.ac (+0/-30)
debian/build-deps (+1/-1)
debian/build-deps.in (+1/-1)
debian/changelog (+35/-0)
debian/control (+1/-1)
debian/patches/0001-pulsesrc-Listen-to-source-output-events-not-sink-inp.patch (+22/-0)
debian/patches/series (+1/-0)
ext/pulse/pulsesrc.c (+1/-1)
farsight/Makefile.am (+0/-2)
farsight/autoconvert/Makefile.am (+0/-24)
farsight/autoconvert/gstautoconvert.c (+0/-1544)
farsight/autoconvert/gstautoconvert.h (+0/-69)
farsight/autoconvert/gstautovideoconvert.c (+0/-287)
farsight/autoconvert/gstautovideoconvert.h (+0/-55)
farsight/autoconvert/plugin.c (+0/-46)
farsight/dtmf/Makefile.am (+0/-36)
farsight/dtmf/gstdtmf.c (+0/-33)
farsight/dtmf/gstdtmfcommon.h (+0/-37)
farsight/dtmf/gstdtmfdetect.c (+0/-281)
farsight/dtmf/gstdtmfdetect.h (+0/-71)
farsight/dtmf/gstdtmfsrc.c (+0/-958)
farsight/dtmf/gstdtmfsrc.h (+0/-101)
farsight/dtmf/gstrtpdtmfcommon.h (+0/-23)
farsight/dtmf/gstrtpdtmfdepay.c (+0/-539)
farsight/dtmf/gstrtpdtmfdepay.h (+0/-68)
farsight/dtmf/gstrtpdtmfsrc.c (+0/-1152)
farsight/dtmf/gstrtpdtmfsrc.h (+0/-115)
farsight/dtmf/tone_detect.c (+0/-503)
farsight/dtmf/tone_detect.h (+0/-95)
farsight/liveadder/Makefile.am (+0/-25)
farsight/liveadder/liveadder.c (+0/-1539)
farsight/liveadder/liveadder.h (+0/-108)
farsight/rtpmux/Makefile.am (+0/-26)
farsight/rtpmux/gstrtpdtmfmux.c (+0/-233)
farsight/rtpmux/gstrtpdtmfmux.h (+0/-67)
farsight/rtpmux/gstrtpmux.c (+0/-882)
farsight/rtpmux/gstrtpmux.h (+0/-96)
farsight/rtpmux/gstrtpmuxer.c (+0/-48)
gst-libs/Makefile.am (+0/-1)
gst-libs/gst/Makefile.am (+0/-9)
gst-libs/gst/basecamerabinsrc/Makefile.am (+0/-39)
gst-libs/gst/basecamerabinsrc/gstbasecamerasrc.c (+0/-566)
gst-libs/gst/basecamerabinsrc/gstbasecamerasrc.h (+0/-142)
gst-libs/gst/basecamerabinsrc/gstcamerabin-enum.c (+0/-39)
gst-libs/gst/basecamerabinsrc/gstcamerabin-enum.h (+0/-62)
gst-libs/gst/basecamerabinsrc/gstcamerabinpreview.c (+0/-404)
gst-libs/gst/basecamerabinsrc/gstcamerabinpreview.h (+0/-56)
gst-libs/gst/interfaces/Makefile.am (+0/-61)
gst-libs/gst/interfaces/photography.c (+0/-624)
gst-libs/gst/interfaces/photography.h (+0/-389)
gst/camerabin/Makefile.am (+0/-63)
gst/camerabin/TODO (+0/-31)
gst/camerabin/camerabindebug.h (+0/-30)
gst/camerabin/camerabingeneral.c (+0/-263)
gst/camerabin/camerabingeneral.h (+0/-36)
gst/camerabin/camerabinimage.c (+0/-775)
gst/camerabin/camerabinimage.h (+0/-96)
gst/camerabin/camerabinpreview.c (+0/-364)
gst/camerabin/camerabinpreview.h (+0/-57)
gst/camerabin/camerabinvideo.c (+0/-843)
gst/camerabin/camerabinvideo.h (+0/-139)
gst/camerabin/gstcamerabin-enum.c (+0/-62)
gst/camerabin/gstcamerabin-enum.h (+0/-112)
gst/camerabin/gstcamerabin-marshal.list (+0/-8)
gst/camerabin/gstcamerabin.c (+0/-4323)
gst/camerabin/gstcamerabin.h (+0/-235)
gst/camerabin/gstcamerabincolorbalance.c (+0/-81)
gst/camerabin/gstcamerabincolorbalance.h (+0/-28)
gst/camerabin/gstinputselector.c (+0/-1498)
gst/camerabin/gstinputselector.h (+0/-84)
gst/camerabin2/Makefile.am (+0/-43)
gst/camerabin2/camerabingeneral.c (+0/-260)
gst/camerabin2/camerabingeneral.h (+0/-37)
gst/camerabin2/gstcamerabin2.c (+0/-2430)
gst/camerabin2/gstcamerabin2.h (+0/-164)
gst/camerabin2/gstimagecapturebin.c (+0/-352)
gst/camerabin2/gstimagecapturebin.h (+0/-63)
gst/camerabin2/gstplugin.c (+0/-46)
gst/camerabin2/gstviewfinderbin.c (+0/-377)
gst/camerabin2/gstviewfinderbin.h (+0/-60)
gst/camerabin2/gstwrappercamerabinsrc.c (+0/-1155)
gst/camerabin2/gstwrappercamerabinsrc.h (+0/-131)
gst/jpegformat/Makefile.am (+0/-27)
gst/jpegformat/gstjifmux.c (+0/-783)
gst/jpegformat/gstjifmux.h (+0/-61)
gst/jpegformat/gstjpegformat.c (+0/-47)
gst/jpegformat/gstjpegformat.h (+0/-92)
gst/jpegformat/gstjpegparse.c (+0/-1057)
gst/jpegformat/gstjpegparse.h (+0/-61)
ltmain.sh (+0/-14)
sys/Makefile.am (+3/-9)
sys/shm/Makefile.am (+0/-13)
sys/shm/gstshm.c (+0/-42)
sys/shm/gstshmsink.c (+0/-659)
sys/shm/gstshmsink.h (+0/-77)
sys/shm/gstshmsrc.c (+0/-445)
sys/shm/gstshmsrc.h (+0/-76)
sys/shm/shmalloc.c (+0/-184)
sys/shm/shmalloc.h (+0/-74)
sys/shm/shmpipe.c (+0/-914)
sys/shm/shmpipe.h (+0/-117)
Branch information
- Owner:
- Iain Lane
- Status:
- Development
Recent revisions
- 68. By Iain Lane
-
Merge up with Debian to get the latest fix.
* Merge from Debian experimental, remaining changes:
- 04_move_farsight_ plugins_ to_good. patch
Import autoconvert, dtmf, liveadder, rptmux from -plugins-bad
- 05_move_shm_to_ good.patch
Import shm from -plugins-bad.
- 07_move-camerabin. patch
Import camerabin, camerabin2, jpegformat and basecamerabinsrc
from -plugins-bad.
- control*:
* Drop dependency from gstreamer0.10-plugins- good on
gstreamer0.10-gconf. It pulls gconf and gtk3 onto the Kubuntu cd.
* Use Breaks instead of Conflicts.
* Add a 'Pre-Depends: ${misc:Pre-Depends} ' to the plugin package,
since we're shipping shared libraries in the package that Debian
isn't. - 67. By Sjoerd Simons
-
* d/p/0001-
pulsesrc- Listen- to-source- output- events- not-sink- inp.patch
+ Added. Listen to the right type of events in pulsesrc for volume and mute
changes. (From upstream git) - 66. By Sebastian Dröge
-
* debian/
build-deps. in:
+ Build-depend on libpng-dev instead of libpng12-dev (Closes: #662365). - 65. By Sebastian Dröge
-
* New upstream release, "Faster":
+ debian/rules,
debian/build-deps. in:
- (Build-) depend on GStreamer core/base >= 0.10.36. - 64. By Philipp Kaluza
-
* Non-maintainer upload.
* Add Replaces/Breaks to gstreamer0.10-gconf for old
gstreamer0.10-plugins- good (Closes: #646325) - 63. By Sjoerd Simons
-
[ Sebastian Dröge ]
* debian/control.in:
+ Let gstreamer0.10-plugins- good depend on gstreamer0.10-gconf for
wheezy to guarantee correct upgrades to wheezy (Closes: #625567).[ Sjoerd Simons ]
* debian/patches/ 04_rtpgst722pay -compensate- for-clockrate. patch:
+ Correct clockrate vs. samplerate difference for G722. Fixes people
sounding like chipmunks on voip calls with G722 (From upstream git) - 62. By Sebastian Dröge
-
* New upstream release, "Adagio":
+ debian/patches/ 01_path- max.patch:
- Dropped, merged upstream. - 61. By Sebastian Dröge
-
* debian/
patches/ 01_path- max.patch:
+ Define PATH_MAX if it isn't defined, e.g. on GNU Hurd. Thanks
to Pino Toscano for the patch (Closes: #626698).
* debian/rules,
debian/gstreamer- plugins- good.install:
+ Don't build the oss4 plugin on GNU Hurd, it does not compile
because of the way how ioctl() works there. Thanks to Pino
Toscano for the patch (Closes: #626698). - 60. By Sebastian Dröge
-
* New upstream release, "Soft Cheese Enthusiast":
+ debian/gstreamer- plugins- good.install:
- The quicktime plugin was renamed to isomp4 because
of trademark concerns.
+ debian/rules,
debian/build-deps. in:
- Build-depend on GStreamer core/base 0.10.33. - 59. By Sebastian Dröge
-
* debian/control.in,
debian/rules,
debian/gstreamer- plugins- good.install,
debian/gstreamer- gconf.install:
+ Split the GConf plugin into it's own package. GStreamer is used
as the default phonon backend nowadays and there's no reason
why KDE should depend on half of GNOME (Closes: #595651).
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:ubuntu/quantal/gst-plugins-good0.10