~ubuntu-branches/ubuntu/trusty/gst-plugins-bad1.0/trusty-proposed

« back to all changes in this revision

Viewing changes to gst-libs/gst/mpegts/Makefile.am

  • Committer: Package Import Robot
  • Author(s): Iain Lane
  • Date: 2014-01-10 11:35:48 UTC
  • mfrom: (13.1.16 sid)
  • Revision ID: package-import@ubuntu.com-20140110113548-z8cxdengubvsd12s
Tags: 1.2.2-1ubuntu1
* Merge from Debian unstable.  Remaining changes:
  + Stop installing camerabin2 basecamerabin jpegformat - plugins which have
  moved to -good.
  + Provide gstreamer-plugins-bad-1.0.pc with Requires on
    gstreamer-plugins-good-1.0 - the package we've moved the referenced
    library to. This maintains compatibility with upstream software and
    other distributions.
  + debian/patches/adding-mirsink-and-android-media-over-hybris-support.patch:
    - Adding mirsink and Android media over hybris support, for hardware
      accelerated decode using libstagefright and the hybris compat layer.
  + debian/control.in:
    - Making the hybris plugin as part of a separated package, and i386 and
      armhf only (can only work with android compatible archs)
  + debian/build-deps.in:
    - Adding mirsink/android decoder specific build dependencies for i386 and
      armhf (libplatform-api1-dev and libmedia-dev)

Show diffs side-by-side

added added

removed removed

Lines of Context:
17
17
        gst-dvb-section.h                       \
18
18
        gstmpegtsdescriptor.h                   \
19
19
        gst-dvb-descriptor.h                    \
20
 
        mpegts.h
21
 
 
 
20
        mpegts.h \
 
21
        gstmpegts-enumtypes.h
22
22
 
23
23
libgstmpegts_@GST_API_VERSION@_la_CFLAGS = \
24
24
        $(GST_PLUGINS_BAD_CFLAGS) \
45
45
glib_gen_basename=gstmpegts
46
46
 
47
47
BUILT_SOURCES = gstmpegts-enumtypes.c gstmpegts-enumtypes.h
48
 
nodist_libgstmpegts_@GST_API_VERSION@_la_SOURCES = $(BUILT_SOURCES)
 
48
nodist_libgstmpegts_@GST_API_VERSION@_la_SOURCES = gstmpegts-enumtypes.c
49
49
 
50
50
CLEANFILES = $(BUILT_SOURCES)
51
51