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 442888 - problem with GTK+ medialib integration
problem with GTK+ medialib integration
Status: RESOLVED FIXED
Product: gtk+
Classification: Platform
Component: Backend: X11
unspecified
Other opensolaris
: Normal normal
: ---
Assigned To: gtk-bugs
gtk-bugs
Depends on:
Blocks:
 
 
Reported: 2007-06-01 12:48 UTC by Brian Cameron
Modified: 2007-06-07 04:44 UTC
See Also:
GNOME target: ---
GNOME version: 2.19/2.20


Attachments
patch fixing the problem (542 bytes, patch)
2007-06-01 12:48 UTC, Brian Cameron
needs-work Details | Review
updated patch (472 bytes, patch)
2007-06-05 05:47 UTC, Brian Cameron
accepted-commit_now Details | Review

Description Brian Cameron 2007-06-01 12:48:33 UTC
Recently, the patches for bug #344813 went into GTK+ to add mediaLib support.

However, I caught one bug in this code.  The gdk/gdkmedialib.h file isn't being included in the distribution tarballs because the gtkmedialib.h file is only being added to gdk_headers if USE_MEDIALIB is turned on.  Instead, this header file should always be included in the distribution tarball.  Otherwise, the build fails because of this missing header when USE_MEDIALIB is on.

The attached minor patch to gdk/Makefile.am fixes this problem.  Can this go upstream?  I've tested this and verified that when I run "make dist" it includes the gdk/gdkmedialib.h file in the tarball.
Comment 1 Brian Cameron 2007-06-01 12:48:53 UTC
Created attachment 89178 [details] [review]
patch fixing the problem
Comment 2 Matthias Clasen 2007-06-01 13:06:56 UTC
Given that _gdk_use_medialib() is underscore-prefixed, it is not exported from the library anyway, so installing that header makes no sense. And adding it to gdk_headers installs it, so a better fix might be to add it to EXTRA_DIST either directly, or indirectly, by introducing some gdk_private_headers variable like we have in gtk/Makefile.am.
Comment 3 Brian Cameron 2007-06-05 05:47:22 UTC
Created attachment 89378 [details] [review]
updated patch


Thanks for the comments.  This patch moves gdkmedialib.h to EXTRA_DIST instead.  Can this go upstream?
Comment 4 Matthias Clasen 2007-06-05 05:55:03 UTC
Looks fine.
Comment 5 Brian Cameron 2007-06-05 06:06:37 UTC
Thanks.  Can I commit, or will you?
Comment 6 Matthias Clasen 2007-06-05 06:16:14 UTC
If you can do it, please go ahead.
Comment 7 Richard Hult 2007-06-06 11:44:51 UTC
This breaks the build:

gdk_headers: variable `medialib_h_sources' is used but `medialib_h_sources' is undefined

I guess the right fix is to remove the remaining reference to that variable?
Comment 8 Matthias Clasen 2007-06-06 15:48:13 UTC
Fixed earlier today
Comment 9 Brian Cameron 2007-06-07 04:44:19 UTC
I'm really sorry about breaking the build.  Thanks for correcting this Matthias.