After an evaluation, GNOME has moved from Bugzilla to GitLab. Learn more about GitLab.
No new issues can be reported in GNOME Bugzilla anymore.
To report an issue in a GNOME project, go to GNOME GitLab.
Do not go to GNOME Gitlab for: Bluefish, Doxygen, GnuCash, GStreamer, java-gnome, LDTP, NetworkManager, Tomboy.
Bug 732411 - rtsp server GIR has wrong C include
rtsp server GIR has wrong C include
Status: RESOLVED FIXED
Product: GStreamer
Classification: Platform
Component: gst-rtsp-server
unspecified
Other Linux
: Normal blocker
: 1.3.91
Assigned To: GStreamer Maintainers
GStreamer Maintainers
Depends on:
Blocks:
 
 
Reported: 2014-06-29 06:25 UTC by Evan Nemerson
Modified: 2014-07-04 12:57 UTC
See Also:
GNOME target: ---
GNOME version: ---


Attachments
introspection: fix C include name (991 bytes, patch)
2014-06-29 06:25 UTC, Evan Nemerson
none Details | Review
Make rtsp-server.h a single-include header, use it for G-I (2.64 KB, patch)
2014-06-30 07:42 UTC, Evan Nemerson
committed Details | Review

Description Evan Nemerson 2014-06-29 06:25:15 UTC
Created attachment 279514 [details] [review]
introspection: fix C include name

--c-include="gst/gst.h" is passed to g-ir-scanner.  I *think* this should be --c-include="gst/rtsp-server/rtsp-server.h"... does rtsp-server.h include all the other headers?

Attached patch assumes rtsp-server.h is correct.
Comment 1 Evan Nemerson 2014-06-29 22:55:18 UTC
rtsp-server.h doesn't include (directly or indirectly, AFAICT) rtsp-media-factory-uri.h and rtsp-params.h.  Can we just add those two includes to rtsp-server.h?  Or create a new single-include header, but I'm not sure what to call it.
Comment 2 Sebastian Dröge (slomo) 2014-06-30 06:56:38 UTC
It also does not include e.g. rtsp-context.h (which however includes rtsp-server.h itself!). There is some more work needed here to create a single-include header.
Comment 3 Evan Nemerson 2014-06-30 07:05:57 UTC
rtsp-server.h includes rtsp-client.h which includes rtsp-context.h.

Based on a quick script I threw together rtsp-{media-factory-uri,params}.h are the only ones missing, though I really do any testing.


#!/bin/sh

HEADERS=""

get_includes() {
  for header in `grep -oP '^\#include [\"][^\"]+' "$1" | cut -b11-`; do
    if [[ "$HEADERS" != *${header}* ]]; then
      HEADERS="$HEADERS $header"
      get_includes "$header"
    fi;
  done;
}

get_includes "$1"

for header in $HEADERS; do
  echo $header
done | sort
Comment 4 Evan Nemerson 2014-06-30 07:08:06 UTC
(In reply to comment #3)
> though I really do any testing.

err, really *didn't* do any testing.
Comment 5 Sebastian Dröge (slomo) 2014-06-30 07:08:48 UTC
Can you provide a patch for that then? I think for sanity it would be better to have direct includes to all public headers (see the variable with that name in Makefile.am) should be in there at the end.
Comment 6 Evan Nemerson 2014-06-30 07:42:26 UTC
Created attachment 279576 [details] [review]
Make rtsp-server.h a single-include header, use it for G-I

Is this what you had in mind?
Comment 7 Sebastian Dröge (slomo) 2014-06-30 07:45:48 UTC
commit 41d1ef7ed3df2471bea4894b6106020a74084f19
Author: Evan Nemerson <evan@nemerson.com>
Date:   Mon Jun 30 00:37:59 2014 -0700

    Make rtsp-server.h a single-include header, use it for G-I
    
    https://bugzilla.gnome.org/show_bug.cgi?id=732411